Merge "Rework gnocchi-upgrade to run in a separate upgrade step"

[apex-tripleo-heat-templates.git] / environments / puppet-pacemaker.yaml

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 48e93a0..8cfbab6 100644 (file)
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -4,12 +4,15 @@ resource_registry:
   OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml
   OS::TripleO::Tasks::ControllerPrePuppet: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
   OS::TripleO::Tasks::ControllerPostPuppet: ../extraconfig/tasks/post_puppet_pacemaker.yaml
+  OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
 
   # custom pacemaker services
-  # NOTE: For now we will need to specify overrides to all services
-  # which use pacemaker. In the future (with upcoming HA light work) this
-  # list will hopefully be much smaller however.
-  OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml
-  OS::TripleO::Services::GlanceApi: ../puppet/services/pacemaker/glance-api.yaml
-  OS::TripleO::Services::GlanceRegistry: ../puppet/services/pacemaker/glance-registry.yaml
-  OS::TripleO::Services::NeutronDhcpAgent: ../puppet/services/pacemaker/neutron-dhcp.yaml
+  # NOTE: Please before adding any pacemaker-managed services, get in touch
+  # with bandini, Ng or beekhof
+  OS::TripleO::Services::CinderVolume: ../puppet/services/pacemaker/cinder-volume.yaml
+  OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
+  OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml
+  OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
+  OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml
+  OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
+  # Services that are disabled by default (use relevant environment files):