diff options
| author | Russell Teague <rteague@redhat.com> | 2017-08-31 14:42:01 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-08-31 15:38:41 -0400 |
| commit | ecb0cbe04149fdcbf3992ccfc7578c6605462bc3 (patch) | |
| tree | 4583608ae6c33d57d1bfd2e71ab54be8ada50ecc /playbooks/common/openshift-master | |
| parent | a00df5740d98b1ba8aaef07d3f5ad16a12be3219 (diff) | |
| download | openshift-ecb0cbe04149fdcbf3992ccfc7578c6605462bc3.tar.gz openshift-ecb0cbe04149fdcbf3992ccfc7578c6605462bc3.tar.bz2 openshift-ecb0cbe04149fdcbf3992ccfc7578c6605462bc3.tar.xz openshift-ecb0cbe04149fdcbf3992ccfc7578c6605462bc3.zip | |
Break out node config into stand-alone playbook
Added byo/openshift-node/config.yml as a new entry point for performing
node installation. This playbook must be run after masters have already
been deployed.
Excluder disable/enable for both nodes and masters has been moved their
respective config.yml. This created a common pattern that could be used
for both installation and scaleup playbooks.
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 }}" |