diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-02-09 15:13:06 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-02-16 14:21:09 -0500 |
| commit | 16e1f777e1df9371c4570aed149b29bd4cdc1a6f (patch) | |
| tree | 35206264f5012a027ea7ec2dec59311342eef82e /playbooks/common | |
| parent | 89afc792b4c49e926d50b1d99c2a79ce13526285 (diff) | |
| download | openshift-16e1f777e1df9371c4570aed149b29bd4cdc1a6f.tar.gz openshift-16e1f777e1df9371c4570aed149b29bd4cdc1a6f.tar.bz2 openshift-16e1f777e1df9371c4570aed149b29bd4cdc1a6f.tar.xz openshift-16e1f777e1df9371c4570aed149b29bd4cdc1a6f.zip | |
Re-arrange scaleup playbooks.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml (renamed from playbooks/common/openshift-cluster/scaleup.yml) | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/scaleup.yml | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 3c2935048..b9d595576 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -188,6 +188,10 @@ masters_needing_certs: "{{ hostvars | oo_select_keys(groups['oo_masters_to_config'] | difference(groups['oo_first_master'])) | oo_filter_list(filter_attr='master_certs_missing') }}" + master_hostnames: "{{ hostvars + | oo_select_keys(groups['oo_masters_to_config']) + | oo_collect('openshift.common.all_hostnames') + | oo_flatten | unique }}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" roles: - openshift_master_certificates diff --git a/playbooks/common/openshift-cluster/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 2ba5bb8a2..36b121d1c 100644 --- a/playbooks/common/openshift-cluster/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -1,5 +1,5 @@ --- -- include: evaluate_groups.yml +- include: ../openshift-cluster/evaluate_groups.yml - name: Configure docker hosts hosts: oo_nodes_to_config @@ -27,6 +27,7 @@ - openshift_facts: role: master local_facts: + ha: "{{ openshift_master_ha | default(groups.oo_masters | length > 1) }}" master_count: "{{ openshift_master_count | default(groups.oo_masters | length) }}" - name: Update master count lineinfile: diff --git a/playbooks/common/openshift-node/scaleup.yml b/playbooks/common/openshift-node/scaleup.yml new file mode 100644 index 000000000..26b792153 --- /dev/null +++ b/playbooks/common/openshift-node/scaleup.yml @@ -0,0 +1,4 @@ +--- +- include: ../openshift-cluster/evaluate_groups.yml + +- include: ../openshift-node/config.yml |