summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-29 15:38:23 +0000
committerGerrit Code Review <review@openstack.org>2016-03-29 15:38:23 +0000
commit717d949ddfe128c84239418c5559464172ec236f (patch)
tree68d4947d8b8c82333410e6e53dc6b270d284c973
parent8191dd49bf71c66db64176d1abd88209a4184d5a (diff)
parent7b2e56053f6cf7535c7ae416c5cb41e7c9679924 (diff)
Merge "Don't restart Pacemaker-managed services from Puppet"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp18
1 files changed, 18 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7c5fd6bd..c639a21d 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -18,6 +18,24 @@ Pcmk_resource <| |> {
try_sleep => 3,
}
+# TODO(jistr): use pcs resource provider instead of just no-ops
+Service <|
+ tag == 'aodh-service' or
+ tag == 'cinder-service' or
+ tag == 'ceilometer-service' or
+ tag == 'glance-service' or
+ tag == 'heat-service' or
+ tag == 'keystone-service' or
+ tag == 'neutron-service' or
+ tag == 'nova-service' or
+ tag == 'sahara-service'
+|> {
+ hasrestart => true,
+ restart => '/bin/true',
+ start => '/bin/true',
+ stop => '/bin/true',
+}
+
include ::tripleo::packages
include ::tripleo::firewall