aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-05 17:48:03 +0000
committerGerrit Code Review <review@openstack.org>2016-07-05 17:48:03 +0000
commit8b332b088c5f63659296aa0cc46361d27b1666d7 (patch)
treec3e0782d1b5bc49956e664b3aafc8db83a934337 /puppet/manifests
parent314430e8f71b8908efb064bb81969e8c39eb1341 (diff)
parentbacd786c71d3c8bae4391e9c47719fa286982ec4 (diff)
Merge "pacemaker: don't override Service resource for Nova & Neutron"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7205002..e58892e 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -22,9 +22,7 @@ Pcmk_resource <| |> {
Service <|
tag == 'aodh-service' or
tag == 'ceilometer-service' or
- tag == 'gnocchi-service' or
- tag == 'neutron-service' or
- tag == 'nova-service'
+ tag == 'gnocchi-service'
|> {
hasrestart => true,
restart => '/bin/true',