X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fpuppet-pacemaker.yaml;h=da607a72cdd3d232105df529de31e6e76c927fe4;hb=0d04302abd19f98df3cd700f9cc4ec47273e5dac;hp=3e24f988553be22b3115df82f2759b8b01e980f6;hpb=a671a30b5196aa5953576928be526d70aed265fe;p=apex-tripleo-heat-templates.git

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 3e24f988..da607a72 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -1,30 +1,21 @@
 # An environment which enables configuration of an
 # Overcloud controller with Pacemaker.
 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::CinderApi: ../puppet/services/pacemaker/cinder-api.yaml
-  OS::TripleO::Services::CinderScheduler: ../puppet/services/pacemaker/cinder-scheduler.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::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
-  OS::TripleO::Services::NeutronServer: ../puppet/services/pacemaker/neutron-server.yaml
   OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
   OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml
-  OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml
+  OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
+  OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml
-  OS::TripleO::Services::NovaConductor: ../puppet/services/pacemaker/nova-conductor.yaml
+  OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
+  # Services that are disabled by default (use relevant environment files):
+
+  # Services that are disabled for HA deployments with pacemaker
+  OS::TripleO::Services::Keepalived: OS::Heat::None