From 7813ebadb8c86d7d1e23fb72914731415fc10acb Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 11 Feb 2020 16:28:10 -0600 Subject: [PATCH] Use domain variable instead of generic resource data When migrating from puppet to ansible, some variables were changed to be more specific. Included in this was the variable for domain creation, which is used when deploying keystone with domain-specific backend template (e.g., backing keystone domains to LDAP servers): https://review.opendev.org/#/c/701026/19 Recently, domain information was put into batched_tripleo_keystone_resources_domains instead of batched_tripleo_keystone_resources_data. This commit updates the domain plays to use the new variable. Not doing this will result in an error like the following on the undercloud: fatal: [undercloud]: FAILED! => {"msg": "'batched_tripleo_keystone_resources_data' is undefined"} Change-Id: I33530e6e3f7ac156e07545b0455c99bb7d2274ef (cherry picked from commit e970807e68fa8a373f685571b6bd8f7e755a2752) --- .../roles/tripleo-keystone-resources/tasks/domains.yml | 2 +- tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml index 4eb08fee9..7e2a5fd03 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml @@ -22,7 +22,7 @@ async: 60 poll: 0 register: tripleo_keystone_resources_domain_results - loop: "{{ batched_tripleo_keystone_resources_data }}" + loop: "{{ batched_tripleo_keystone_resources_domains }}" loop_control: loop_var: tripleo_keystone_resources_domain diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml index 58feb2f75..d9fe3816b 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml @@ -45,7 +45,7 @@ include_tasks: domains.yml loop: "{{ tripleo_keystone_resources_catalog_config | get_key_from_dict(key='domains') | batch(tripleo_keystone_resources_batch) | list }}" loop_control: - loop_var: batched_tripleo_keystone_resources_data + loop_var: batched_tripleo_keystone_resources_domains # We need to gather domains so later we can convert a domain name into a domain ID. # This is needed because os_user_role doesn't do the conversion yet in the version