diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-23 17:22:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 17:22:41 -0800 |
| commit | cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6 (patch) | |
| tree | 9007e4fb698b54dfe0970c89ec474d6280d9855b /playbooks/container-runtime/private | |
| parent | 1600ee8a77efef3b79120fa69f9fa82f3d426360 (diff) | |
| parent | 0da99aa00c87299bf3f4e17833ba3690c6e1c345 (diff) | |
| download | openshift-cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6.tar.gz openshift-cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6.tar.bz2 openshift-cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6.tar.xz openshift-cd1c2e70df4fa519e88c75fde154cdc4bfc3b9d6.zip | |
Merge pull request #6802 from mgugino-upstream-stage/fix-etcd-scaleup
Automatic merge from submit-queue.
Fix etcd scaleup playbook
Currently, etcd scaleup playbook has no way to account
for newly added prerequisites.yml play.
This commit allows adding new etcd hosts via scaleup play
and accounts for etcd hosts that are standalone or part
of nodes or masters group.
Diffstat (limited to 'playbooks/container-runtime/private')
| -rw-r--r-- | playbooks/container-runtime/private/build_container_groups.yml | 4 | ||||
| -rw-r--r-- | playbooks/container-runtime/private/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/container-runtime/private/setup_storage.yml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/playbooks/container-runtime/private/build_container_groups.yml b/playbooks/container-runtime/private/build_container_groups.yml index a2361d50c..8fb7b63e8 100644 --- a/playbooks/container-runtime/private/build_container_groups.yml +++ b/playbooks/container-runtime/private/build_container_groups.yml @@ -1,6 +1,8 @@ --- +# l_build_container_groups_hosts is passed in via prerequisites.yml during +# etcd scaleup plays. - name: create oo_hosts_containerized_managed_true host group - hosts: oo_all_hosts:!oo_nodes_to_config + hosts: "{{ l_build_container_groups_hosts | default('oo_all_hosts:!oo_nodes_to_config') }}" tasks: - group_by: key: oo_hosts_containerized_managed_{{ (openshift_is_containerized | default(False)) | ternary('true','false') }} diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml index 817a8bf30..5396df20a 100644 --- a/playbooks/container-runtime/private/config.yml +++ b/playbooks/container-runtime/private/config.yml @@ -1,9 +1,11 @@ --- # l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. +# l_etcd_scale_up_hosts may be passed in via prerequisites.yml during etcd +# scaleup plays. - import_playbook: build_container_groups.yml -- hosts: "{{ l_scale_up_hosts | default(l_default_container_runtime_hosts) }}" +- hosts: "{{ l_etcd_scale_up_hosts | default(l_scale_up_hosts) | default(l_default_container_runtime_hosts) }}" vars: l_default_container_runtime_hosts: "oo_nodes_to_config:oo_hosts_containerized_managed_true" roles: diff --git a/playbooks/container-runtime/private/setup_storage.yml b/playbooks/container-runtime/private/setup_storage.yml index 65630be62..586149b1d 100644 --- a/playbooks/container-runtime/private/setup_storage.yml +++ b/playbooks/container-runtime/private/setup_storage.yml @@ -1,9 +1,11 @@ --- # l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. +# l_etcd_scale_up_hosts may be passed in via prerequisites.yml during etcd +# scaleup plays. - import_playbook: build_container_groups.yml -- hosts: "{{ l_scale_up_hosts | default(l_default_container_storage_hosts) }}" +- hosts: "{{ l_etcd_scale_up_hosts | default(l_scale_up_hosts) | default(l_default_container_storage_hosts) }}" vars: l_default_container_storage_hosts: "oo_nodes_to_config:oo_hosts_containerized_managed_true" l_chg_temp: "{{ hostvars[groups['oo_first_master'][0]]['openshift_containerized_host_groups'] | default([]) }}" |