aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2017-10-20 10:20:50 +0200
committerMarius Cornea <mcornea@redhat.com>2017-11-08 18:23:25 +0000
commitbcea7e76f4e766a1c04b1e14048da9ab08d42b86 (patch)
tree91f25b0f6b4d36d59b34054b1e63d875168e9617
parentf27d3a4d59413761b7b2edcef1aa620b0bd6384d (diff)
Do not set cluster in maintenance mode during split stack upgrade
This change noops ControllerDeployedServer{Pre,Post}Config to avoid getting the upgrade of a split stack deployment getting stuck due to the cluster being in maintenance mode. For reference a similar change has been done for the regular Controller role in: https://review.openstack.org/#/c/487313/ Change-Id: Idd393011b3c4d0d236780e11a04a59d426750de1 Closes-bug: 1725175 (cherry picked from commit 8e92d7c6db6fcae863a250f63b01a98f7a3f3340)
-rw-r--r--environments/deployed-server-pacemaker-environment.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/environments/deployed-server-pacemaker-environment.yaml b/environments/deployed-server-pacemaker-environment.yaml
index cc9ea99..83d81bb 100644
--- a/environments/deployed-server-pacemaker-environment.yaml
+++ b/environments/deployed-server-pacemaker-environment.yaml
@@ -1,4 +1,4 @@
resource_registry:
- OS::TripleO::Tasks::ControllerDeployedServerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
- OS::TripleO::Tasks::ControllerDeployedServerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml
+ OS::TripleO::Tasks::ControllerDeployedServerPreConfig: OS::Heat::None
+ OS::TripleO::Tasks::ControllerDeployedServerPostConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerDeployedServerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml