diff options
| author | ZhongShengping <chdzsp@163.com> | 2016-09-19 16:28:59 +0800 |
|---|---|---|
| committer | ZhongShengping <chdzsp@163.com> | 2016-09-20 08:44:23 +0800 |
| commit | 2042ad285036b44695e7f274d07a39618f9c7749 (patch) | |
| tree | b77466d1fad59c1fa9f21a41922262480065c8f7 | |
| parent | 186339968644ec834ddaca9cc68aba342443d539 (diff) | |
| download | kolla-2042ad285036b44695e7f274d07a39618f9c7749.tar.gz kolla-2042ad285036b44695e7f274d07a39618f9c7749.zip | |
Deprecate old auth parameters of ironic in nova.conf
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
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 02b1a2041..7a635c66f 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -93,10 +93,12 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }} {% if service_name == "nova-compute-ironic" %} [ironic] -admin_username = {{ ironic_keystone_user }} -admin_password = {{ ironic_keystone_password }} -admin_url = {{ openstack_auth.auth_url }}/v2.0 -admin_tenant_name = service +username = {{ ironic_keystone_user }} +password = {{ ironic_keystone_password }} +auth_url = {{ openstack_auth.auth_url }}/v3 +project_name = service +user_domain_name = default +project_domain_name = default api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1 {% endif %} |