openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Update loop_vars" into stable/ussuri

This commit is contained in:
Zuul 2020-06-15 23:59:08 +00:00 committed by Gerrit Code Review
parent 7f96ee799d c8d6df4631
commit eb1a21b05f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/container_startup_configs_tasks.yaml
View File

@ -11,9 +11,11 @@
- name: "Creating container startup configs for {{ step_path }}" - name: "Creating container startup configs for {{ step_path }}"
copy: copy:
content: "{{ item.value | to_nice_json }}" content: "{{ startup_data.value | to_nice_json }}"
dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ item.key }}.json" dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ startup_data.key }}.json"
setype: container_file_t setype: container_file_t
mode: 0600 mode: 0600
no_log: true no_log: true
loop_control:
loop_var: startup_data
loop: "{{ item.1 | dict2items }}" loop: "{{ item.1 | dict2items }}"

4
deployment/deprecated/docker/docker-baremetal-ansible.yaml
View File

@ -191,11 +191,11 @@ outputs:
block: block:
- name: Pre-fetch all the containers - name: Pre-fetch all the containers
become: true become: true
shell: "docker pull {{ container_image }}" shell: "docker pull {{ prefetch_image }}"
retries: 5 retries: 5
delay: 5 delay: 5
loop_control: 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 }}" 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: service_config_settings:
neutron_l3: neutron_l3:

4
deployment/podman/podman-baremetal-ansible.yaml
View File

@ -147,12 +147,12 @@ outputs:
- name: Pre-fetch all the containers - name: Pre-fetch all the containers
become: true become: true
podman_image: podman_image:
name: "{{ container_image }}" name: "{{ prefetch_image }}"
validate_certs: false validate_certs: false
retries: 5 retries: 5
delay: 5 delay: 5
loop_control: 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 }}" 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: {} service_config_settings: {}