Merge "Disable xinetd class when creating swift-storage puppet configuration" into...

[apex-tripleo-heat-templates.git] / environments / docker-ha.yaml

diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 474e996..1e25a35 100644 (file)
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -5,6 +5,8 @@ resource_registry:
   # Pacemaker runs on the host
   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