openstack/kolla-ansible
Code Issues Proposed changes

Deprecate old auth parameters of ironic in nova.conf

Browse Source 
The auth parameters `admin_username`, `admin_password`,
`admin_tenant_name` and `admin_url` of the [ironic] config
option group are now deprecated and will be removed in a
future release. Using these parameters will log a warning.
Please use `username`, `password`, `project_name `and
`auth_url` instead.

Change-Id: I9e383788e35b83888b3b5cf927f67b0f3b4ef54b
Closes-Bug: 1619266
This commit is contained in:
ZhongShengping 2016-09-19 16:28:59 +08:00
parent 1863399686
commit 2042ad2850
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 %}