Handle Murano installed by plugin
Change-Id: Ied1caf84bb76bcddb1b836355605c08a0984c432 Closes-Bug: 1623910
This commit is contained in:
parent
342de46ffe
commit
4eea18f781
|
@ -12,7 +12,7 @@ class octane_tasks::dbsync (
|
|||
include ::cinder::db::sync
|
||||
include ::heat::db::sync
|
||||
|
||||
if $octane_tasks::params::murano_enabled {
|
||||
if $octane_tasks::params::murano_enabled or $octane_tasks::params::murano_plugin_enabled {
|
||||
include ::murano::db::sync
|
||||
}
|
||||
|
||||
|
|
|
@ -4,19 +4,22 @@
|
|||
#
|
||||
class octane_tasks::params (
|
||||
) {
|
||||
$nova_hash = hiera_hash('nova')
|
||||
$ceilometer_hash = hiera_hash('ceilometer', {'enabled' => false})
|
||||
$sahara_hash = hiera_hash('sahara', {'enabled' => false})
|
||||
$murano_hash = hiera_hash('murano', {'enabled' => false})
|
||||
$ironic_hash = hiera_hash('ironic', {'enabled' => false})
|
||||
$storage_hash = hiera_hash('storage', {})
|
||||
$fuel_version = hiera('fuel_version', '9.0')
|
||||
$nova_hash = hiera_hash('nova')
|
||||
$ceilometer_hash = hiera_hash('ceilometer', {'enabled' => false})
|
||||
$sahara_hash = hiera_hash('sahara', {'enabled' => false})
|
||||
$murano_hash = hiera_hash('murano', {'enabled' => false})
|
||||
$ironic_hash = hiera_hash('ironic', {'enabled' => false})
|
||||
$storage_hash = hiera_hash('storage', {})
|
||||
$fuel_version = hiera('fuel_version', '9.0')
|
||||
|
||||
$ceilometer_enabled = $ceilometer_hash['enabled']
|
||||
$sahara_enabled = $sahara_hash['enabled']
|
||||
$murano_enabled = $murano_hash['enabled']
|
||||
$ironic_enabled = $ironic_hash['enabled']
|
||||
$cinder_vol_on_ctrl = $storage_hash['volumes_ceph']
|
||||
$murano_plugin_hash = hiera_hash('detach-murano', {'metadata' => {'enabled' => false} })
|
||||
|
||||
$ceilometer_enabled = $ceilometer_hash['enabled']
|
||||
$sahara_enabled = $sahara_hash['enabled']
|
||||
$murano_enabled = $murano_hash['enabled']
|
||||
$murano_plugin_enabled = $murano_plugin_hash['metadata']['enabled']
|
||||
$ironic_enabled = $ironic_hash['enabled']
|
||||
$cinder_vol_on_ctrl = $storage_hash['volumes_ceph']
|
||||
|
||||
# Nova
|
||||
$nova_services_list = [
|
||||
|
@ -63,7 +66,7 @@ class octane_tasks::params (
|
|||
]
|
||||
|
||||
# Murano
|
||||
if $murano_enabled {
|
||||
if $murano_enabled or $murano_plugin_enabled {
|
||||
$murano_services_list = ['murano-api', 'murano-engine']
|
||||
} else {
|
||||
$murano_services_list = []
|
||||
|
|
Loading…
Reference in New Issue