From bacd786c71d3c8bae4391e9c47719fa286982ec4 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 4 Jul 2016 08:25:59 -0400 Subject: 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 --- puppet/manifests/overcloud_controller_pacemaker.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'puppet/manifests') 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', -- cgit 1.2.3-korg