Don't restart Pacemaker-managed services from Puppet

We need to reload/restart services on updates/upgrades to apply any
config changes, but restarting services managed from Pacemaker from
Puppet causes problems.

For now we no-op the restart and rely on the catch-all restart after
Puppet phase.

In the future we should have a service provider for pacemaker resources
that will be using pcs. We still might have to restart services outside
Puppet due to cluster-wide orchestration issues, but we might be able to
do the restarts selectively rather than restart everything.

We also no-op the start/stop commands to be safe, as it also doesn't
make sense for Puppet to try start and stop those services when it
doesn't have knowledge about Pacemaker.

Change-Id: I95e21e10471cd7575f28c095c48150325f1414b3
Closes-Bug: #1562922

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7c5fd6b..c639a21 100644 (file)
--- 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