x
/
fuel-plugin-openstack-telemetry
Code Issues Proposed changes

Merge "Fix heat-engine provider"

This commit is contained in:
Jenkins 2017-03-20 11:07:00 +00:00 committed by Gerrit Code Review
parent 8af2b096c7 32d6e48917
commit 6cda677c89
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment_scripts/puppet/manifests/notifications.pp
View File

@ -14,6 +14,7 @@
notice('fuel-plugin-openstack-telemetry: notifications.pp') notice('fuel-plugin-openstack-telemetry: notifications.pp')
$fuel_version = 0 + hiera('fuel_version')
$ceilometer = hiera_hash('ceilometer', {}) $ceilometer = hiera_hash('ceilometer', {})
$rabbit = hiera_hash('rabbit') $rabbit = hiera_hash('rabbit')
$storage_options = hiera_hash('storage', {}) $storage_options = hiera_hash('storage', {})
@ -224,10 +225,17 @@ else {
hasrestart => true, hasrestart => true,
} }
# The heat-engine service is managed by Pacemaker. # In MOS >=10 heat-engine isn't managed by pacemaker LP #1673074
service { $heat_engine_service: if $fuel_version < 10.0 {
hasstatus => true, service { $heat_engine_service:
hasrestart => true, hasstatus => true,
provider => 'pacemaker', hasrestart => true,
provider => 'pacemaker',
}
} else {
service { $heat_engine_service:
hasstatus => true,
hasrestart => true,
}
} }