From 872110d14c6e56d74d19207e470944a5024914b7 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 8 May 2020 16:40:59 -0600 Subject: [PATCH] Update loop_vars We're currently throwing warnings about duplicated loop variables so we should specific different variable names for these loops. Change-Id: I359d6402a67f6ab4b810e294fdbf3ca02d140d6d (cherry picked from commit a833432b163573a9b113acbb5b87b7b7bbff0c81) --- common/container_startup_configs_tasks.yaml | 9 ++++++--- .../deprecated/docker/docker-baremetal-ansible.yaml | 4 ++-- deployment/podman/podman-baremetal-ansible.yaml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/container_startup_configs_tasks.yaml b/common/container_startup_configs_tasks.yaml index a3b1d1403e..510e8c6a99 100644 --- a/common/container_startup_configs_tasks.yaml +++ b/common/container_startup_configs_tasks.yaml @@ -11,8 +11,11 @@ - name: "Creating container startup configs for {{ step_path }}" copy: - content: "{{ item.value | to_nice_json }}" - dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ item.key }}.json" - setype: svirt_sandbox_file_t + content: "{{ startup_data.value | to_nice_json }}" + dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ startup_data.key }}.json" + setype: container_file_t mode: 0600 + no_log: true + loop_control: + loop_var: startup_data loop: "{{ item.1 | dict2items }}" diff --git a/deployment/deprecated/docker/docker-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-baremetal-ansible.yaml index f7d79e7449..5f3e82d026 100644 --- a/deployment/deprecated/docker/docker-baremetal-ansible.yaml +++ b/deployment/deprecated/docker/docker-baremetal-ansible.yaml @@ -191,11 +191,11 @@ outputs: block: - name: Pre-fetch all the containers become: true - shell: "docker pull {{ container_image }}" + shell: "docker pull {{ prefetch_image }}" retries: 5 delay: 5 loop_control: - loop_var: container_image + loop_var: prefetch_image loop: "{{ lookup('file', tripleo_role_name + '/docker_config.yaml', errors='ignore') | default('{}', True) | from_yaml | recursive_get_key_from_dict(key='image') | unique }}" service_config_settings: neutron_l3: diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 8acf401a90..677bcc11e5 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -147,12 +147,12 @@ outputs: - name: Pre-fetch all the containers become: true podman_image: - name: "{{ container_image }}" + name: "{{ prefetch_image }}" validate_certs: false retries: 5 delay: 5 loop_control: - loop_var: container_image + loop_var: prefetch_image loop: "{{ lookup('file', tripleo_role_name + '/docker_config.yaml', errors='ignore') | default('{}', True) | from_yaml | recursive_get_key_from_dict(key='image') | unique }}" service_config_settings: {}