diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-19 17:21:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 17:21:46 -0500 |
| commit | 3c1eba1488e1d3570320381ee5eee6ea760e7659 (patch) | |
| tree | dee97878b906bd8ceea20ee2af9737a422d7254c /playbooks/container-runtime | |
| parent | 7ad419c31b79c85d610143f95777040db4b5b1b7 (diff) | |
| parent | 6646d0275739585f5c1ad59e6b27c01fbc374e02 (diff) | |
| download | openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.gz openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.bz2 openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.xz openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.zip | |
Merge pull request #6784 from mgugino-upstream-stage/fix-node-scaleup
Fix node scaleup plays
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 |