openstack/kolla-ansible
Code Issues Proposed changes

Merge "Deprecate old auth parameters of ironic in nova.conf"

Browse Source
This commit is contained in:
Jenkins 2016-09-20 12:26:44 +00:00 committed by Gerrit Code Review
commit ee7ce6eebd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/nova/templates/nova.conf.j2
View File

@ -93,10 +93,12 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }}
{% if service_name == "nova-compute-ironic" %} {% if service_name == "nova-compute-ironic" %}
[ironic] [ironic]
admin_username = {{ ironic_keystone_user }} username = {{ ironic_keystone_user }}
admin_password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
admin_url = {{ openstack_auth.auth_url }}/v2.0 auth_url = {{ openstack_auth.auth_url }}/v3
admin_tenant_name = service project_name = service
user_domain_name = default
project_domain_name = default
api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1 api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1
{% endif %} {% endif %}