From 32d6e489178e65345e0ec1824b73baa67aa122ff Mon Sep 17 00:00:00 2001 From: Mykyta Karpin Date: Thu, 16 Mar 2017 15:06:38 +0200 Subject: [PATCH] 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 --- .../puppet/manifests/notifications.pp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/deployment_scripts/puppet/manifests/notifications.pp b/deployment_scripts/puppet/manifests/notifications.pp index 07778e8..87552db 100644 --- a/deployment_scripts/puppet/manifests/notifications.pp +++ b/deployment_scripts/puppet/manifests/notifications.pp @@ -14,6 +14,7 @@ notice('fuel-plugin-openstack-telemetry: notifications.pp') +$fuel_version = 0 + hiera('fuel_version') $ceilometer = hiera_hash('ceilometer', {}) $rabbit = hiera_hash('rabbit') $storage_options = hiera_hash('storage', {}) @@ -224,10 +225,17 @@ else { hasrestart => true, } - # The heat-engine service is managed by Pacemaker. - service { $heat_engine_service: - hasstatus => true, - hasrestart => true, - provider => 'pacemaker', + # In MOS >=10 heat-engine isn't managed by pacemaker LP #1673074 + if $fuel_version < 10.0 { + service { $heat_engine_service: + hasstatus => true, + hasrestart => true, + provider => 'pacemaker', + } + } else { + service { $heat_engine_service: + hasstatus => true, + hasrestart => true, + } }