aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-07-04 08:25:59 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-04 08:25:59 -0400
commitbacd786c71d3c8bae4391e9c47719fa286982ec4 (patch)
tree62c3fca09988e4c170919312530489f06dd82f20 /puppet/manifests
parenta70464cd0d03c785bf9e87ba842f1a68aaa7a511 (diff)
pacemaker: don't override Service resource for Nova & Neutron
Nova & Neutron services are already managed by puppet-tripleo in profiles, and we already override Service resource for some services to manage them with Pacemaker. Dropping this code here will allow us to run TripleO in AIO setup as we don't manage everything with Pacemaker. Change-Id: Idcfc6ea26ca41534ce407be0eb3dafe7bcd2ef2d
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 9f636ddd..b740968c 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',