summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-12 12:05:10 +0200
committerGitHub <noreply@github.com>2017-05-12 12:05:10 +0200
commit52c19f7eeffe9dc8b480f6645564be5f1dffe677 (patch)
treeb1e7425beaecc8d7508cec97446b47dda988f89c /playbooks/common/openshift-master
parent593ef653c0d17876b871a221587a472cb0235c97 (diff)
parentba67bf5e155b81d5f313f6e8492ffd5d3b583286 (diff)
downloadopenshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.gz
openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.bz2
openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.xz
openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.zip
Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-only
run excluders over selected set of hosts during control_plane/node upgrade
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml16
1 files changed, 14 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index ab0045a39..49594d294 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -60,9 +60,15 @@
- openshift_facts
- openshift_docker
-- include: ../openshift-cluster/disable_excluder.yml
+- name: Disable excluders
+ hosts: oo_masters_to_config
tags:
- always
+ gather_facts: no
+ tasks:
+ - include_role:
+ name: openshift_excluder
+ tasks_from: disable
- include: ../openshift-master/config.yml
@@ -70,6 +76,12 @@
- include: ../openshift-node/config.yml
-- include: ../openshift-cluster/reset_excluder.yml
+- name: Re-enable excluder if it was previously enabled
+ hosts: oo_masters_to_config
tags:
- always
+ gather_facts: no
+ tasks:
+ - include_role:
+ name: openshift_excluder
+ tasks_from: enable