openstack
/
openstack-ansible-os_ironic
Code Issues Proposed changes

Use ironic credentials when connecting to other APIs. 

When ironic is connecting to another service's API, it should use
its own credentials to obtain an authtoken with keystone.

Without this patch, ironic deployment would fail with an undefined
variable "neutron_service_adminurl", which is not required.

It is not defined since a patch removed it from the group vars.

[1]: https://review.opendev.org/#/c/658178/

Change-Id: Ib8f67b195d1d74cc7997822fa1f5f0ac2176393d
This commit is contained in:
Jean-Philippe Evrard 2019-06-27 17:12:22 +02:00
parent 16b7848240
commit 9f0d4d3b33
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/ironic.conf.j2
View File

@ -143,17 +143,13 @@ region_name = {{ keystone_service_region }}
[neutron]
url = {{ neutron_service_adminurl }}
region_name = {{ neutron_service_region }}
auth_type = password
# Keystone client plugin password option
password = {{ neutron_service_password }}
# Keystone client plugin username option
username = {{ neutron_service_user_name }}
project_name = {{ neutron_service_project_name }}
user_domain_name = {{ neutron_service_domain_name |default("Default") }}
project_domain_name = {{ neutron_service_domain_name |default("Default") }}
# Keystone client plugin authentication URL option
# Keystone auth using ironic credentials
username = {{ ironic_service_user_name }}
password = {{ ironic_service_password }}
project_name = {{ ironic_service_project_name }}
user_domain_id = {{ ironic_service_user_domain_id }}
project_domain_id = {{ ironic_service_project_domain_id }}
auth_url = {{ keystone_service_adminurl }}
insecure = {{ keystone_service_adminuri_insecure | bool }}
{% if ironic_neutron_provisioning_network_name is defined %}