From bba497d40d522ebccad6a688aade0e227aa60eae Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 31 Jul 2020 09:20:19 -0600 Subject: [PATCH] Use label rather than no_log We can prevent having to hide sensitive data while being able to provide a more descriptive output for what task is being executed by using the label loop_control attribute. https://docs.ansible.com/ansible/latest/user_guide/playbooks_loops.html#limiting-loop-output-with-label Change-Id: I2ea2b77bcf1be66a57cfb22463b81189ef2802f1 (cherry picked from commit 1920faf816df2a001d7325306c8da94ece5216e1) --- .../roles/tripleo-clients-install/tasks/main.yml | 11 +++++++---- tripleo_ansible/roles/tripleo-kernel/tasks/main.yml | 11 +++++++---- .../tripleo-keystone-resources/tasks/domains.yml | 1 + .../tripleo-keystone-resources/tasks/endpoints.yml | 4 ++-- .../tripleo-keystone-resources/tasks/projects.yml | 1 + .../roles/tripleo-keystone-resources/tasks/roles.yml | 1 + .../tripleo-keystone-resources/tasks/services.yml | 4 ++-- .../tasks/user_per_role.yml | 2 ++ .../roles/tripleo-keystone-resources/tasks/users.yml | 4 +++- 9 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml index 1288447cf..cbe38f241 100644 --- a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml @@ -50,10 +50,13 @@ {% endfor %} {{ package_sets }} -- name: "Run package install" +- name: "Manage package" package: - name: "{{ item.value }}" - state: "{{ item.key }}" + name: "{{ pkg.value }}" + state: "{{ pkg.key }}" when: - - (item.value | length) > 0 + - (pkg.value | length) > 0 loop: "{{ client_package_facts | dict2items }}" + loop_control: + label: "{{ pkg.value }}: {{ pkg.key }}" + loop_var: pkg diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/main.yml b/tripleo_ansible/roles/tripleo-kernel/tasks/main.yml index be72b862b..b5ddb7307 100644 --- a/tripleo_ansible/roles/tripleo-kernel/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-kernel/tasks/main.yml @@ -70,13 +70,16 @@ - name: Set extra sysctl options sysctl: - name: "{{ item.key }}" - value: "{{ item.opt.value }}" - sysctl_set: "{{ item.opt.set | default(true) }}" - state: "{{ item.opt.state | default('present') }}" + name: "{{ setting.key }}" + value: "{{ setting.opt.value }}" + sysctl_set: "{{ setting.opt.set | default(true) }}" + state: "{{ setting.opt.state | default('present') }}" sysctl_file: "/etc/sysctl.d/99-tripleo.conf" reload: false loop: "{{ tripleo_kernel_sysctl_extra_settings | dict2items(key_name='key', value_name='opt') }}" + loop_control: + label: "{{ setting.key }}" + loop_var: setting register: _extra_sysctl_result - name: Sysctl reload diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml index 297b030cd..276cb1dcb 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml @@ -31,6 +31,7 @@ jid: "{{ tripleo_keystone_resources_domain_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_domain_results.results }}" loop_control: + label: "{{ tripleo_keystone_resources_domain_async_result_item.tripleo_keystone_resources_domain }}" loop_var: "tripleo_keystone_resources_domain_async_result_item" register: tripleo_keystone_resources_domain_async_poll_results until: tripleo_keystone_resources_domain_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml index 48b1de496..d89e7f79b 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml @@ -15,7 +15,6 @@ # under the License. - name: "Async creation of Keystone {{ keystone_endpoint_type }} endpoint" - no_log: "{{ tripleo_keystone_resources_hide_sensitive_logs | bool }}" os_keystone_endpoint: cloud: "{{ tripleo_keystone_resources_cloud_name }}" service: "{{ tripleo_keystone_resources_data.key }}" @@ -28,14 +27,15 @@ register: tripleo_keystone_resources_endpoint_results loop: "{{ batched_tripleo_keystone_resources_data }}" loop_control: + label: "{{ tripleo_keystone_resources_data.key }}" loop_var: tripleo_keystone_resources_data - name: "Check Keystone {{ keystone_endpoint_type }} endpoint status" - no_log: "{{ not (tripleo_keystone_resources_debug | bool) }}" async_status: jid: "{{ tripleo_keystone_resources_endpoint_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_endpoint_results.results }}" loop_control: + label: "{{ tripleo_keystone_resources_endpoint_async_result_item.tripleo_keystone_resources_data.key }}" loop_var: "tripleo_keystone_resources_endpoint_async_result_item" register: tripleo_keystone_resources_endpoint_async_poll_results until: tripleo_keystone_resources_endpoint_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml index 17bf61710..e43eaacd0 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml @@ -32,6 +32,7 @@ jid: "{{ tripleo_keystone_resources_project_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_project_results.results }}" loop_control: + label: "{{ tripleo_keystone_resources_project_async_result_item.tripleo_keystone_resources_project }}" loop_var: "tripleo_keystone_resources_project_async_result_item" register: tripleo_keystone_resources_project_async_poll_results until: tripleo_keystone_resources_project_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml index 4b4b9a4b2..6db7a965b 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml @@ -31,6 +31,7 @@ jid: "{{ tripleo_keystone_resources_role_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_role_results.results }}" loop_control: + label: "{{ tripleo_keystone_resources_role_async_result_item.tripleo_keystone_resources_role }}" loop_var: "tripleo_keystone_resources_role_async_result_item" register: tripleo_keystone_resources_role_async_poll_results until: tripleo_keystone_resources_role_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml index 480ad3bb4..50b8ccb8f 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml @@ -15,7 +15,6 @@ # under the License. - name: Async creation of Keystone service - no_log: "{{ tripleo_keystone_resources_hide_sensitive_logs | bool }}" os_keystone_service: cloud: "{{ tripleo_keystone_resources_cloud_name }}" name: "{{ tripleo_keystone_resources_data.key }}" @@ -27,14 +26,15 @@ register: tripleo_keystone_resources_service_results loop: "{{ batched_tripleo_keystone_resources_data }}" loop_control: + label: "{{ tripleo_keystone_resources_data.key }}" loop_var: tripleo_keystone_resources_data - name: Check Keystone service status - no_log: "{{ not (tripleo_keystone_resources_debug | bool) }}" async_status: jid: "{{ tripleo_keystone_resources_service_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_service_results.results }}" loop_control: + label: "{{ tripleo_keystone_resources_service_async_result_item.tripleo_keystone_resources_data.key }}" loop_var: "tripleo_keystone_resources_service_async_result_item" register: tripleo_keystone_resources_service_async_poll_results until: tripleo_keystone_resources_service_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml index 3695f7cd2..83bcb5d9b 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml @@ -30,6 +30,7 @@ register: tripleo_keystone_resources_user_role_results loop: "{{ tripleo_keystone_resources_data_users }}" loop_control: + label: "{{ lookup('dict', tripleo_keystone_resources_data_user).key }}" loop_var: tripleo_keystone_resources_data_user - name: "Check Keystone user assignment to roles status" @@ -37,6 +38,7 @@ jid: "{{ tripleo_keystone_resources_user_role_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_user_role_results.results }}" loop_control: + label: "{{ lookup('dict', tripleo_keystone_resources_user_role_async_result_item.tripleo_keystone_resources_data_user).key }}" loop_var: "tripleo_keystone_resources_user_role_async_result_item" register: tripleo_keystone_resources_user_role_async_poll_results until: tripleo_keystone_resources_user_role_async_poll_results.finished diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml index b00f896da..48e77abb9 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml @@ -15,6 +15,7 @@ # under the License. - name: "Async creation of Keystone user" + # needed because it'll throw a warning if you have update_password without it no_log: "{{ tripleo_keystone_resources_hide_sensitive_logs | bool }}" os_user: cloud: "{{ tripleo_keystone_resources_cloud_name }}" @@ -29,14 +30,15 @@ register: tripleo_keystone_resources_user_results loop: "{{ batched_tripleo_keystone_resources_data }}" loop_control: + label: "{{ lookup('dict', tripleo_keystone_resources_data).value.name | default(lookup('dict', tripleo_keystone_resources_data).key) }}" loop_var: tripleo_keystone_resources_data - name: "Check Keystone user status" - no_log: "{{ not (tripleo_keystone_resources_debug | bool) }}" async_status: jid: "{{ tripleo_keystone_resources_user_async_result_item.ansible_job_id }}" loop: "{{ tripleo_keystone_resources_user_results.results }}" loop_control: + label: "{{ lookup('dict', tripleo_keystone_resources_user_async_result_item.tripleo_keystone_resources_data).key }}" loop_var: "tripleo_keystone_resources_user_async_result_item" register: tripleo_keystone_resources_user_async_poll_results until: tripleo_keystone_resources_user_async_poll_results.finished