Browse Source

Handle Murano installed by plugin

Change-Id: Ied1caf84bb76bcddb1b836355605c08a0984c432
Closes-Bug: 1623910
changes/71/371071/3
Pavel Chechetin 2 years ago
parent
commit
4eea18f781

+ 1
- 1
deployment/puppet/octane_tasks/manifests/dbsync.pp View File

@@ -12,7 +12,7 @@ class octane_tasks::dbsync (
12 12
   include ::cinder::db::sync
13 13
   include ::heat::db::sync
14 14
 
15
-  if $octane_tasks::params::murano_enabled {
15
+  if $octane_tasks::params::murano_enabled or $octane_tasks::params::murano_plugin_enabled {
16 16
     include ::murano::db::sync
17 17
   }
18 18
 

+ 16
- 13
deployment/puppet/octane_tasks/manifests/params.pp View File

@@ -4,19 +4,22 @@
4 4
 #
5 5
 class octane_tasks::params (
6 6
 ) {
7
-  $nova_hash        = hiera_hash('nova')
8
-  $ceilometer_hash  = hiera_hash('ceilometer', {'enabled' => false})
9
-  $sahara_hash      = hiera_hash('sahara', {'enabled' => false})
10
-  $murano_hash      = hiera_hash('murano', {'enabled' => false})
11
-  $ironic_hash      = hiera_hash('ironic', {'enabled' => false})
12
-  $storage_hash     = hiera_hash('storage', {})
13
-  $fuel_version     = hiera('fuel_version', '9.0')
7
+  $nova_hash            = hiera_hash('nova')
8
+  $ceilometer_hash      = hiera_hash('ceilometer', {'enabled' => false})
9
+  $sahara_hash          = hiera_hash('sahara', {'enabled' => false})
10
+  $murano_hash          = hiera_hash('murano', {'enabled' => false})
11
+  $ironic_hash          = hiera_hash('ironic', {'enabled' => false})
12
+  $storage_hash         = hiera_hash('storage', {})
13
+  $fuel_version         = hiera('fuel_version', '9.0')
14 14
 
15
-  $ceilometer_enabled  = $ceilometer_hash['enabled']
16
-  $sahara_enabled      = $sahara_hash['enabled']
17
-  $murano_enabled      = $murano_hash['enabled']
18
-  $ironic_enabled      = $ironic_hash['enabled']
19
-  $cinder_vol_on_ctrl  = $storage_hash['volumes_ceph']
15
+  $murano_plugin_hash   = hiera_hash('detach-murano', {'metadata' =>  {'enabled' => false} })
16
+
17
+  $ceilometer_enabled     = $ceilometer_hash['enabled']
18
+  $sahara_enabled         = $sahara_hash['enabled']
19
+  $murano_enabled         = $murano_hash['enabled']
20
+  $murano_plugin_enabled  = $murano_plugin_hash['metadata']['enabled']
21
+  $ironic_enabled         = $ironic_hash['enabled']
22
+  $cinder_vol_on_ctrl     = $storage_hash['volumes_ceph']
20 23
 
21 24
   # Nova
22 25
   $nova_services_list = [
@@ -63,7 +66,7 @@ class octane_tasks::params (
63 66
   ]
64 67
 
65 68
   # Murano
66
-  if $murano_enabled {
69
+  if $murano_enabled or $murano_plugin_enabled {
67 70
     $murano_services_list = ['murano-api', 'murano-engine']
68 71
   } else {
69 72
     $murano_services_list = []

Loading…
Cancel
Save