Browse Source

Merge "Use label rather than no_log" into stable/train

changes/48/747348/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
2ab64161ef
9 changed files with 26 additions and 13 deletions
  1. +7
    -4
      tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
  2. +7
    -4
      tripleo_ansible/roles/tripleo-kernel/tasks/main.yml
  3. +1
    -0
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml
  4. +2
    -2
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml
  5. +1
    -0
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml
  6. +1
    -0
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml
  7. +2
    -2
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml
  8. +2
    -0
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml
  9. +3
    -1
      tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml

+ 7
- 4
tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml View File

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

+ 7
- 4
tripleo_ansible/roles/tripleo-kernel/tasks/main.yml View File

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


+ 1
- 0
tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml View File

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


+ 2
- 2
tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml View File

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


+ 1
- 0
tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml View File

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


+ 1
- 0
tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml View File

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


+ 2
- 2
tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml View File

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


+ 2
- 0
tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml View File

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


+ 3
- 1
tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml View File

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


Loading…
Cancel
Save