Convert with_dict tasks to use loop and be less chatty
with_dict is replaced by ansible's loop: https://docs.ansible.com/ansible/latest/user_guide/playbooks_loops.html#with-dict This migrates tasks using with_dict over to use loop instead. Additionally, when using loop (or with_dict), the entire loop item is logged by default. This makes these tasks very verbose since we're looping over large json/yaml files. Instead, use loop_control and label ot only log the item key. The entire data structure already exists in the config-download directory anyway, so there's no need to log the whole thing to the console. Conflicts: common/deploy-steps-tasks.yaml Change-Id: I1fc7431dfc662212b6ca64f4f738760f25b0c30b (cherry picked from commit1b0c827930
) (cherry picked from commit94df25e339
)
This commit is contained in:
parent
46dcc24dbe
commit
ace57871fa
|
@ -114,8 +114,10 @@
|
||||||
- container_config_scripts
|
- container_config_scripts
|
||||||
|
|
||||||
- name: Write docker config scripts
|
- name: Write docker config scripts
|
||||||
copy: content="{{item.value.content}}" dest="/var/lib/docker-config-scripts/{{item.key}}" force=yes mode="{{item.value.mode|default('0600', true)}}"
|
copy: content="{{ item[1].content }}" dest="/var/lib/docker-config-scripts/{{ item[0] }}" force=yes mode="{{ item[1].mode | default('0600', true) }}"
|
||||||
with_dict: "{{role_data_docker_config_scripts}}"
|
loop: "{{ role_data_docker_config_scripts | dictsort }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item[0] }}"
|
||||||
tags:
|
tags:
|
||||||
- container_config_scripts
|
- container_config_scripts
|
||||||
|
|
||||||
|
@ -162,8 +164,10 @@
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
- name: Write per-step docker-container-startup-configs
|
- name: Write per-step docker-container-startup-configs
|
||||||
copy: content="{{item.value|to_json}}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{item.key}}.json" force=yes mode=0600
|
copy: content="{{ item[1] | to_json }}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{ item[0] }}.json" force=yes mode=0600
|
||||||
with_dict: "{{docker_config_with_default}}"
|
loop: "{{ docker_config_with_default | dictsort }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item[0] }}"
|
||||||
tags:
|
tags:
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
|
@ -190,8 +194,10 @@
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
- name: Write kolla config json files
|
- name: Write kolla config json files
|
||||||
copy: content="{{item.value|to_json}}" dest="{{item.key}}" force=yes mode=0600
|
copy: content="{{ item[1] | to_json }}" dest="{{ item[0] }}" force=yes mode=0600
|
||||||
with_dict: "{{role_data_kolla_config}}"
|
loop: "{{ role_data_kolla_config | dictsort }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item[0] }}"
|
||||||
tags:
|
tags:
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
|
@ -227,8 +233,10 @@
|
||||||
- container_config_tasks
|
- container_config_tasks
|
||||||
|
|
||||||
- name: Write docker-puppet-tasks json files
|
- name: Write docker-puppet-tasks json files
|
||||||
copy: content="{{item.value|to_json}}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{item.key.replace("step_", "")}}.json force=yes mode=0600
|
copy: content="{{ item[1] | to_json }}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{ item[0].replace("step_", "") }}.json force=yes mode=0600
|
||||||
with_dict: "{{role_data_docker_puppet_tasks}}"
|
loop: "{{ role_data_docker_puppet_tasks | dictsort }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item[0] }}"
|
||||||
when: deploy_server_id == bootstrap_server_id
|
when: deploy_server_id == bootstrap_server_id
|
||||||
tags:
|
tags:
|
||||||
- container_config_tasks
|
- container_config_tasks
|
||||||
|
|
Loading…
Reference in New Issue