Browse Source

Fix heat-engine provider

Starting MOS 10.0 heat-engine isn't run under pacemaker,
so we need to unset the provider field.

Change-Id: I838feeb265bfc707628241f0e9da10a5c73838da
Closes-Bug: #1673074
Mykyta Karpin 2 years ago
parent
commit
32d6e48917
1 changed files with 13 additions and 5 deletions
  1. 13
    5
      deployment_scripts/puppet/manifests/notifications.pp

+ 13
- 5
deployment_scripts/puppet/manifests/notifications.pp View File

@@ -14,6 +14,7 @@
14 14
 
15 15
 notice('fuel-plugin-openstack-telemetry: notifications.pp')
16 16
 
17
+$fuel_version         = 0 + hiera('fuel_version')
17 18
 $ceilometer           = hiera_hash('ceilometer', {})
18 19
 $rabbit               = hiera_hash('rabbit')
19 20
 $storage_options      = hiera_hash('storage', {})
@@ -224,10 +225,17 @@ else {
224 225
     hasrestart => true,
225 226
   }
226 227
 
227
-  # The heat-engine service is managed by Pacemaker.
228
-  service { $heat_engine_service:
229
-    hasstatus  => true,
230
-    hasrestart => true,
231
-    provider   => 'pacemaker',
228
+  # In MOS >=10 heat-engine isn't managed by pacemaker LP #1673074
229
+  if $fuel_version < 10.0 {
230
+    service { $heat_engine_service:
231
+      hasstatus  => true,
232
+      hasrestart => true,
233
+      provider   => 'pacemaker',
234
+    }
235
+  } else {
236
+    service { $heat_engine_service:
237
+      hasstatus  => true,
238
+      hasrestart => true,
239
+    }
232 240
   }
233 241
 

Loading…
Cancel
Save