Browse Source

Merge "Update loop_vars" into stable/ussuri

changes/15/735815/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
eb1a21b05f
3 changed files with 8 additions and 6 deletions
  1. +4
    -2
      common/container_startup_configs_tasks.yaml
  2. +2
    -2
      deployment/deprecated/docker/docker-baremetal-ansible.yaml
  3. +2
    -2
      deployment/podman/podman-baremetal-ansible.yaml

+ 4
- 2
common/container_startup_configs_tasks.yaml View File

@@ -11,9 +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"
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 }}"

+ 2
- 2
deployment/deprecated/docker/docker-baremetal-ansible.yaml View File

@@ -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:


+ 2
- 2
deployment/podman/podman-baremetal-ansible.yaml View File

@@ -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: {}


Loading…
Cancel
Save