From 94df25e339368439d144c18142f50f442f219285 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Mon, 17 Sep 2018 17:26:47 -0400
Subject: [PATCH] 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.

Change-Id: I1fc7431dfc662212b6ca64f4f738760f25b0c30b
(cherry picked from commit 1b0c827930866538a8d1cae91f1c31bbd09b4199)
---
 common/deploy-steps-tasks.yaml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 8961470d93..2a646fdf59 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -70,11 +70,13 @@
 
         - name: Write docker config scripts
           copy:
-            content: "{{ item.value.content }}"
-            dest: "/var/lib/docker-config-scripts/{{ item.key }}"
+            content: "{{ item[1].content }}"
+            dest: "/var/lib/docker-config-scripts/{{ item[0] }}"
             force: yes
-            mode: "{{ item.value.mode | default('0600', true) }}"
-          with_dict: "{{ role_data_docker_config_scripts }}"
+            mode: "{{ item[1].mode | default('0600', true) }}"
+          loop: "{{ role_data_docker_config_scripts | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           vars:
             role_data_docker_config_scripts: "{{ lookup('file', tripleo_role_name + '/docker_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
           tags:
@@ -114,11 +116,13 @@
 
         - 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"
+            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:
             - container_startup_configs
 
@@ -134,11 +138,13 @@
 
         - name: Write kolla config json files
           copy:
-            content: "{{ item.value | to_json }}"
-            dest: "{{ item.key }}"
+            content: "{{ item[1] | to_json }}"
+            dest: "{{ item[0] }}"
             force: yes
             mode: '0600'
-          with_dict: "{{ lookup('file', tripleo_role_name + '/kolla_config.yaml', errors='ignore') | default([], True) | from_yaml }}"
+          loop: "{{ lookup('file', tripleo_role_name + '/kolla_config.yaml', errors='ignore') | default([], True) | from_yaml | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           tags:
             - container_startup_configs
 
@@ -158,11 +164,13 @@
 
         - 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
+            content: "{{item[1]|to_json}}"
+            dest: /var/lib/docker-puppet/docker-puppet-tasks{{item[0].replace("step_", "")}}.json
             force: yes
             mode: '0600'
-          with_dict: "{{ lookup('file', tripleo_role_name + '/docker_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}"
+          loop: "{{ lookup('file', tripleo_role_name + '/docker_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml | dictsort }}"
+          loop_control:
+            label: "{{ item[0] }}"
           when: deploy_server_id == bootstrap_server_id
           tags:
             - container_config_tasks