openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Add glance auth information to ironic.conf for communication"

Browse Source
This commit is contained in:
Zuul 2018-06-29 19:55:33 +00:00 committed by Gerrit Code Review
commit af5b268007
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@ -266,6 +266,12 @@ ironic_uwsgi_bind_address: 0.0.0.0
# Glance
ironic_glance_auth_strategy: "{{ ironic_openstack_auth_strategy }}"
ironic_glance_service_project_name: "{{ glance_service_project_name | default('service') }}"
ironic_glance_service_project_domain_id: "{{ glance_service_project_domain_id | default('default') }}"
ironic_glance_keystone_auth_plugin: "{{ glance_keystone_auth_plugin | default('password') }}"
ironic_glance_service_user_name: "{{ glance_service_user_name | default('glance') }}"
ironic_glance_service_user_domain_id: "{{ glance_service_user_domain_id | default('default') }}"
ironic_glance_keystone_auth_url: "{{ keystone_service_internalurl | default('http://localhost:5000/v3') }}"
# Neutron
ironic_neutron_auth_strategy: "{{ ironic_openstack_auth_strategy }}"

7
templates/ironic.conf.j2
View File

@ -61,6 +61,13 @@ dhcp_provider = {{ ironic_dhcp_provider }}
[glance]
# TODO(evrardjp): Remove this in the future to use the service catalog
# and reduce the amount of variables.
auth_url = {{ ironic_glance_keystone_auth_url }}
auth_type = {{ ironic_glance_keystone_auth_plugin }}
project_name = {{ ironic_glance_service_project_name }}
project_domain_id = {{ ironic_glance_service_project_domain_id }}
username = {{ ironic_glance_service_user_name }}
user_domain_id = {{ ironic_glance_service_user_domain_id }}
password = {{ glance_service_password }}
glance_api_servers = {{ ironic_glance_api_servers }}
{% if not ironic_standalone | bool %}
swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }}