X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fdocker-ha.yaml;h=1e25a357327a16cabb817634f25bd444ee54852c;hb=30bf7b3ab907c8dddc35d2f9b1640c653acb71c9;hp=442262b31588ae0550cc70650364a138a878a192;hpb=711bb776198ab076f38eca04b69f08cefd15048b;p=apex-tripleo-heat-templates.git

diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 442262b3..1e25a357 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -3,18 +3,18 @@
 # ...deploy..-e docker.yaml -e docker-ha.yaml
 resource_registry:
   # Pacemaker runs on the host
-  OS::TripleO::Tasks::ControllerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
-  OS::TripleO::Tasks::ControllerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml
-  OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
   OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
 
   # Services that are disabled for HA deployments with pacemaker
   OS::TripleO::Services::Keepalived: OS::Heat::None
 
   # HA Containers managed by pacemaker
-  OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
-  OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
+  # FIXME: enable those Cinder services once their non-HA counterpart are enabled
+  # OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
+  # OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
   OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml
   OS::TripleO::Services::HAproxy: ../docker/services/pacemaker/haproxy.yaml
   OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml