diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-01-18 15:12:35 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-01-18 16:26:50 -0500 |
| commit | 6646d0275739585f5c1ad59e6b27c01fbc374e02 (patch) | |
| tree | 6ad6096f5fef4aee743f2fa10323afcb0bf7d1ba /playbooks/container-runtime | |
| parent | 2efead33407ed6124eae589026d3ba539a6bd8e5 (diff) | |
| download | openshift-6646d0275739585f5c1ad59e6b27c01fbc374e02.tar.gz openshift-6646d0275739585f5c1ad59e6b27c01fbc374e02.tar.bz2 openshift-6646d0275739585f5c1ad59e6b27c01fbc374e02.tar.xz openshift-6646d0275739585f5c1ad59e6b27c01fbc374e02.zip | |
Fix node scaleup plays
Currently, users have no way to run preqrequisites.yml
on just newly added nodes during scaleup.
This commit ensures only the new nodes are changed during
scaleup as well as ensure prerequisites are run.
Diffstat (limited to 'playbooks/container-runtime')
| -rw-r--r-- | playbooks/container-runtime/private/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/container-runtime/private/setup_storage.yml | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml index 7a49adcf0..817a8bf30 100644 --- a/playbooks/container-runtime/private/config.yml +++ b/playbooks/container-runtime/private/config.yml @@ -1,7 +1,11 @@ --- +# l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. + - import_playbook: build_container_groups.yml -- hosts: oo_nodes_to_config:oo_hosts_containerized_managed_true +- hosts: "{{ 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: - role: container_runtime tasks: diff --git a/playbooks/container-runtime/private/setup_storage.yml b/playbooks/container-runtime/private/setup_storage.yml index a6d396270..65630be62 100644 --- a/playbooks/container-runtime/private/setup_storage.yml +++ b/playbooks/container-runtime/private/setup_storage.yml @@ -1,8 +1,11 @@ --- +# l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. + - import_playbook: build_container_groups.yml -- hosts: oo_nodes_to_config:oo_hosts_containerized_managed_true +- hosts: "{{ 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([]) }}" l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}" # role: container_runtime is necessary here to bring role default variables |