diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
| commit | 8cbd53ed64f1819b8f4defbf196140a1692c5a42 (patch) | |
| tree | 7dd61610e8ea6ae373e12dbb1c894047b8feac0f /playbooks/container-runtime | |
| parent | c2de775c80b8daa629af514f24118f704c521c18 (diff) | |
| parent | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff) | |
| download | openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.gz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.bz2 openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.xz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.zip | |
Merge branch 'master' into rm_origin-components
Diffstat (limited to 'playbooks/container-runtime')
| -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([]) }}" |