From a2c215b6e71936cefd03f56ff3ff7f96389aea69 Mon Sep 17 00:00:00 2001
From: Steve Lewis <stevelle@gmail.com>
Date: Wed, 9 Mar 2016 12:28:28 -0800
Subject: [PATCH] Resolve oslo_config deprecations in nova.conf

Each of the following log messages are resolved by these changes:

* Option "auth_plugin" from group "keystone_authtoken" is deprecated.
Use option "auth_type" from group "keystone_authtoken".
* Option "use_local" from group "conductor" is deprecated for removal.
* Option "host" from group "glance" is deprecated for removal.
* Option "port" from group "glance" is deprecated for removal.

Under the [glance] group the use of api_servers in all cases is the
current recommendation per related change-id. As a result, the
glance_host and glance_service_port variables which were used to
define the deprecated configuration values are used to construct an
api_servers value that is backwards-compatible.

The glance_host variable is already provided by the OpenStack-Ansible
playbook to install nova so no new required role vars are introduced.
The glance_host var is not renamed to begin with the nova_ namespace
prefix at this time. That change should be introduced in a following
patch.

The following message is not addressed:
* Option "username" from group "keystone_authtoken" is deprecated.
Use option "user-name" from group "keystone_authtoken".

This is a bogus warning, There is no support for use of user-name
in the keystone auth library.

Related-To: I8c973e9f325f5b732d827a702a98eff8ca56cbd7
Change-Id: I8697775ccc77c11b4ed2735f40eaf3c68975a16c
---
 defaults/main.yml      | 1 +
 templates/nova.conf.j2 | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b3f447a8..6129dc36 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -208,6 +208,7 @@ nova_image_cache_manager_interval: 0
 nova_resume_guests_state_on_host_boot: False
 nova_dhcp_domain: novalocal
 nova_default_schedule_zone: nova
+glance_api_servers: "{{ glance_host }}:{{ glance_service_port }}"
 
 # Nova quota
 nova_quota_cores: 20
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index c1270cf3..cdadb1e0 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -156,18 +156,13 @@ vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address
 
 # Glance
 [glance]
-{% if glance_api_servers is defined %}
 api_servers = {{ glance_api_servers }}
-{% else %}
-host = {{ glance_host }}
-port = {{ glance_service_port }}
-{% endif %}
 
 # Neutron
 [neutron]
 url = {{ neutron_service_adminurl }}
 region_name = {{ neutron_service_region }}
-auth_plugin = password
+auth_type = password
 # Keystone client plugin password option
 password = {{ neutron_service_password }}
 # Keystone client plugin username option
@@ -183,7 +178,6 @@ service_metadata_proxy = {{ nova_metadata_proxy_enabled }}
 
 
 [conductor]
-use_local = false
 topic = conductor
 manager = nova.conductor.manager.ConductorManager
 workers = {{ nova_conductor_workers | default(api_threads) }}