summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2017-07-26 09:46:53 +0200
committerMarius Cornea <mcornea@redhat.com>2017-07-26 14:42:47 +0200
commitca959c66fee38df15ae1662b108e64e1d2bb2c42 (patch)
tree812f40e496dedc548edeb7e2991b596fe182d35a /environments
parent963d1b3db6c76434f8ca4079a31336afb64b11d2 (diff)
Noop controller pre and post config resources.
This change sets the ControllerPreConfig and ControllerPostConfig resources to OS::Heat::None in order to avoid setting the cluster to maintenance mode while upgrading to the docker architecture. Closes-Bug: 1706594 Change-Id: Ibd69670d1617b73a8621b8fd4243041891a96747
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-ha.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 474e9966..1e25a357 100644
--- 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