X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fpuppet-pacemaker.yaml;h=8cfbab6d9fdf45441835d196d5e6f67daecc349a;hb=2df74cc8295bcc96add61d559068153056ba3e5d;hp=679b79cbc1c51377f6bedb533c12925fd9fb460c;hpb=e1d3c42ae970b615c7da138f5b18c8137cbc2f5d;p=apex-tripleo-heat-templates.git

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 679b79cb..8cfbab6d 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -4,21 +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::HeatApi: ../puppet/services/pacemaker/heat-api.yaml
-  OS::TripleO::Services::HeatApiCfn: ../puppet/services/pacemaker/heat-api-cfn.yaml
-  OS::TripleO::Services::HeatApiCloudwatch: ../puppet/services/pacemaker/heat-api-cloudwatch.yaml
-  OS::TripleO::Services::HeatEngine: ../puppet/services/pacemaker/heat-engine.yaml
-  OS::TripleO::Services::NeutronDhcpAgent: ../puppet/services/pacemaker/neutron-dhcp.yaml
-  OS::TripleO::Services::NeutronL3Agent: ../puppet/services/pacemaker/neutron-l3.yaml
-  OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.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::Loadbalancer: ../puppet/services/pacemaker/loadbalancer.yaml
-  OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.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):