Skip to content
Snippets Groups Projects
Commit 3be572f6 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "ironic: Follow up for ironic_enable_keystone_integration"

parents 578ca1d6 46df30d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/ironic/tasks/deploy.yml
+ 1
− 1
View file @ 3be572f6
--- ---
- 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
......
ansible/roles/ironic/templates/ironic-inspector.conf.j2
+ 2
− 2
View file @ 3be572f6
...@@ -19,7 +19,7 @@ ssl_ca_file = {{ om_rabbitmq_cacert }} ...@@ -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 ...@@ -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 }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment