diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-01 08:21:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 08:21:15 -0400 |
| commit | 4a11ed0808f508d7e9d0953149377e2e181bdae9 (patch) | |
| tree | 3df83c2c1239cc6256f88670d077727ef556523b /playbooks/common/openshift-master | |
| parent | 9fef95ead2bd088327627e2773a754f664935761 (diff) | |
| parent | ecb0cbe04149fdcbf3992ccfc7578c6605462bc3 (diff) | |
| download | openshift-4a11ed0808f508d7e9d0953149377e2e181bdae9.tar.gz openshift-4a11ed0808f508d7e9d0953149377e2e181bdae9.tar.bz2 openshift-4a11ed0808f508d7e9d0953149377e2e181bdae9.tar.xz openshift-4a11ed0808f508d7e9d0953149377e2e181bdae9.zip | |
Merge pull request #5282 from mtnbikenc/breakout-node-config
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 16 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 20 |
2 files changed, 16 insertions, 20 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index cd25dd211..96440a2ab 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -1,4 +1,12 @@ --- +- name: Disable excluders + hosts: oo_masters_to_config + gather_facts: no + roles: + - role: openshift_excluder + r_openshift_excluder_action: disable + r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" + - name: Gather and set facts for master hosts hosts: oo_masters_to_config vars: @@ -208,3 +216,11 @@ - name: Create group for deployment type group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }} changed_when: False + +- name: Re-enable excluder if it was previously enabled + hosts: oo_masters_to_config + gather_facts: no + roles: + - role: openshift_excluder + r_openshift_excluder_action: enable + r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 6ad4cde65..17f9ef4bc 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -43,28 +43,8 @@ delay: 1 changed_when: false -- name: Disable excluders - hosts: oo_masters_to_config - tags: - - always - gather_facts: no - roles: - - role: openshift_excluder - r_openshift_excluder_action: disable - r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" - - include: ../openshift-master/config.yml - include: ../openshift-loadbalancer/config.yml - include: ../openshift-node/config.yml - -- name: Re-enable excluder if it was previously enabled - hosts: oo_masters_to_config - tags: - - always - gather_facts: no - roles: - - role: openshift_excluder - r_openshift_excluder_action: enable - r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" |