diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-21 12:09:17 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-21 13:17:53 -0500 |
| commit | 3a14ee697aafa52d94ce577c16378c5fe18dda06 (patch) | |
| tree | 22f08f765c3ef8fb3b07bd1c6be817986c794376 /playbooks/container-runtime | |
| parent | cbcfd8a6d669e5b76afca79d3523bc537df804d3 (diff) | |
| download | openshift-3a14ee697aafa52d94ce577c16378c5fe18dda06.tar.gz openshift-3a14ee697aafa52d94ce577c16378c5fe18dda06.tar.bz2 openshift-3a14ee697aafa52d94ce577c16378c5fe18dda06.tar.xz openshift-3a14ee697aafa52d94ce577c16378c5fe18dda06.zip | |
Fix container_runtime openshift_containerized_host_groups
openshift_containerized_host_groups needs to be referenced via
hostvars.
This commit also updates tox ansible syntax checks to account
for unavailability of hostsvars during syntax checks.
Fixes: https://github.com/openshift/openshift-ansible/issues/6540
Diffstat (limited to 'playbooks/container-runtime')
| -rw-r--r-- | playbooks/container-runtime/private/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/container-runtime/private/setup_storage.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml index 67445edeb..d8fc93710 100644 --- a/playbooks/container-runtime/private/config.yml +++ b/playbooks/container-runtime/private/config.yml @@ -1,7 +1,7 @@ --- - hosts: "{{ l_containerized_host_groups }}" vars: - l_chg_temp: "{{ openshift_containerized_host_groups | default([]) }}" + 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 # into the play scope. diff --git a/playbooks/container-runtime/private/setup_storage.yml b/playbooks/container-runtime/private/setup_storage.yml index 97226d6b2..54fa5ca66 100644 --- a/playbooks/container-runtime/private/setup_storage.yml +++ b/playbooks/container-runtime/private/setup_storage.yml @@ -1,7 +1,7 @@ --- - hosts: "{{ l_containerized_host_groups }}" vars: - l_chg_temp: "{{ openshift_containerized_host_groups | default([]) }}" + 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 # into the play scope. |