From d8b6871f6d5085dc9c731684a9fef4cd9e25f607 Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Wed, 9 Mar 2016 14:47:25 -0500
Subject: [PATCH] Account for oslo_config deprecations in glance config
 templates

Specific changes are based on glance-api and glance-registry logging:
 * Option "notification_topics" from group "DEFAULT" is deprecated. Use option
   "topics" from group "oslo_messaging_notifications"
 * Option "auth_plugin" from group "keystone_authtoken" is deprecated. Use
   option "auth_type" from group "keystone_authtoken".

Change-Id: I329c0a3173584109ef1e6f500fdd55e76c10bb8b
---
 templates/glance-api.conf.j2      | 9 +++------
 templates/glance-registry.conf.j2 | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2
index e036bc60..5c174951 100644
--- a/templates/glance-api.conf.j2
+++ b/templates/glance-api.conf.j2
@@ -24,12 +24,9 @@ enable_v1_registry = {{ glance_enable_v1_registry }}
 enable_v2_api = {{ glance_enable_v2_api }}
 enable_v2_registry = {{ glance_enable_v2_registry }}
 
-#
-# From oslo.messaging
-#
-
 {% if glance_ceilometer_enabled %}
-notification_driver = messagingv2
+[oslo_messaging_notifications]
+driver = messagingv2
 {% endif %}
 
 rpc_backend = {{ glance_rpc_backend }}
@@ -49,7 +46,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}
-auth_plugin = {{ glance_keystone_auth_plugin }}
+auth_type = {{ glance_keystone_auth_plugin }}
 signing_dir = {{ glance_system_user_home }}/cache/api
 auth_url = {{ keystone_service_adminurl }}
 auth_uri = {{ keystone_service_internaluri }}
diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2
index 898e12d9..8d9693d4 100644
--- a/templates/glance-registry.conf.j2
+++ b/templates/glance-registry.conf.j2
@@ -25,7 +25,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}
-auth_plugin = {{ glance_keystone_auth_plugin }}
+auth_type = {{ glance_keystone_auth_plugin }}
 signing_dir = {{ glance_system_user_home }}/cache/registry/
 auth_url = {{ keystone_service_adminurl }}
 auth_uri = {{ keystone_service_internaluri }}