From 2042ad285036b44695e7f274d07a39618f9c7749 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 19 Sep 2016 16:28:59 +0800 Subject: [PATCH] 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 --- ansible/roles/nova/templates/nova.conf.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 02b1a2041e..7a635c66f3 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 %}