openstack/kolla-ansible
Code Issues Proposed changes

Merge "ironic: Follow up for ironic_enable_keystone_integration" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2021-08-11 15:56:59 +00:00 committed by Gerrit Code Review
commit e879cfe2da
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
when: enable_keystone | bool
when: ironic_enable_keystone_integration | bool
- 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 %}
[ironic]
{% if enable_keystone | bool %}
{% if ironic_enable_keystone_integration | bool %}
auth_url = {{ keystone_admin_url }}
auth_type = password
project_domain_id = {{ default_project_domain_id }}
@ -35,7 +35,7 @@ auth_type = none
endpoint_override = {{ ironic_internal_endpoint }}
{% endif %}
{% if enable_keystone | bool %}
{% if ironic_enable_keystone_integration | bool %}
[keystone_authtoken]
www_authenticate_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_admin_url }}