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
This commit is contained in:
parent
a54f96bfdd
commit
e970807e68
|
@ -22,7 +22,7 @@
|
||||||
async: 60
|
async: 60
|
||||||
poll: 0
|
poll: 0
|
||||||
register: tripleo_keystone_resources_domain_results
|
register: tripleo_keystone_resources_domain_results
|
||||||
loop: "{{ batched_tripleo_keystone_resources_data }}"
|
loop: "{{ batched_tripleo_keystone_resources_domains }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: tripleo_keystone_resources_domain
|
loop_var: tripleo_keystone_resources_domain
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
include_tasks: domains.yml
|
include_tasks: domains.yml
|
||||||
loop: "{{ tripleo_keystone_resources_catalog_config | get_key_from_dict(key='domains') | batch(tripleo_keystone_resources_batch) | list }}"
|
loop: "{{ tripleo_keystone_resources_catalog_config | get_key_from_dict(key='domains') | batch(tripleo_keystone_resources_batch) | list }}"
|
||||||
loop_control:
|
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.
|
# 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
|
# This is needed because os_user_role doesn't do the conversion yet in the version
|
||||||
|
|
Loading…
Reference in New Issue