From: Marius Cornea Date: Wed, 26 Jul 2017 07:46:53 +0000 (+0200) Subject: Noop controller pre and post config resources. X-Git-Tag: opnfv-6.0.0~283^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ca959c66fee38df15ae1662b108e64e1d2bb2c42;p=apex-tripleo-heat-templates.git 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 --- 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