openstack/kolla-ansible
Code Issues Proposed changes

ironic: Follow up for ironic_enable_keystone_integration

Browse Source 
Follow up for I0c7e9a28876a1d4278fb2ed8555c2b08472864b9 which added a
ironic_enable_keystone_integration variable to support Ironic in
multi-region environments. This change skips Keystone service
registration based on ironic_enable_keystone_integration rather than
enable_keystone. It also updates the ironic-inspector.conf template to
use the new variable.

Change-Id: I2ecba4999e194766258ac5beed62877d43829313
This commit is contained in:
Mark Goddard 2021-08-10 09:16:59 +01:00
parent 63be501318
commit 46df30d871
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ironic/tasks/deploy.yml
View File

@ -1,6 +1,6 @@
--- ---
- import_tasks: register.yml - import_tasks: register.yml
when: enable_keystone | bool when: ironic_enable_keystone_integration | bool
- import_tasks: config-host.yml - import_tasks: config-host.yml

4
ansible/roles/ironic/templates/ironic-inspector.conf.j2
View File

@ -19,7 +19,7 @@ ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
[ironic] [ironic]
{% if enable_keystone | bool %} {% if ironic_enable_keystone_integration | bool %}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
project_domain_id = {{ default_project_domain_id }} project_domain_id = {{ default_project_domain_id }}
@ -35,7 +35,7 @@ auth_type = none
endpoint_override = {{ ironic_internal_endpoint }} endpoint_override = {{ ironic_internal_endpoint }}
{% endif %} {% endif %}
{% if enable_keystone | bool %} {% if ironic_enable_keystone_integration | bool %}
[keystone_authtoken] [keystone_authtoken]
www_authenticate_uri = {{ keystone_internal_url }} www_authenticate_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}