summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-16 17:30:39 -0400
committerGitHub <noreply@github.com>2017-03-16 17:30:39 -0400
commit132c4a48d4724d21486e36fae616dce38410a2a7 (patch)
tree16dab0d1bb921332219bf128a921dc6bfb349638 /playbooks/common
parent866e5bf8581b8468414b7b192537b616d78a42a3 (diff)
parent8cdc8ef6d651ae3f58fda55438e8f6d592727428 (diff)
downloadopenshift-132c4a48d4724d21486e36fae616dce38410a2a7.tar.gz
openshift-132c4a48d4724d21486e36fae616dce38410a2a7.tar.bz2
openshift-132c4a48d4724d21486e36fae616dce38410a2a7.tar.xz
openshift-132c4a48d4724d21486e36fae616dce38410a2a7.zip
Merge pull request #3681 from ingvagabund/enable-excluders-during-scale-up-as-well
enable excluders during node/master scaling up
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml11
-rw-r--r--playbooks/common/openshift-node/scaleup.yml11
2 files changed, 22 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index 18e5c665f..c59747081 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -60,8 +60,19 @@
- openshift_facts
- openshift_docker
+- include: ../openshift-cluster/disable_excluder.yml
+ vars:
+ # the excluders needs to be disabled no matter what status says
+ with_status_check: false
+ tags:
+ - always
+
- include: ../openshift-master/config.yml
- include: ../openshift-loadbalancer/config.yml
- include: ../openshift-node/config.yml
+
+- include: ../openshift-cluster/reset_excluder.yml
+ tags:
+ - always
diff --git a/playbooks/common/openshift-node/scaleup.yml b/playbooks/common/openshift-node/scaleup.yml
index bb3b1e780..d81bd152e 100644
--- a/playbooks/common/openshift-node/scaleup.yml
+++ b/playbooks/common/openshift-node/scaleup.yml
@@ -27,4 +27,15 @@
- openshift_facts
- openshift_docker
+- include: ../openshift-cluster/disable_excluder.yml
+ vars:
+ # the excluders needs to be disabled no matter what status says
+ with_status_check: false
+ tags:
+ - always
+
- include: ../openshift-node/config.yml
+
+- include: ../openshift-cluster/reset_excluder.yml
+ tags:
+ - always