From 2c850708ef3903bba2f7e5b6e3ac557e615aee2c Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Wed, 9 Mar 2016 14:34:34 -0500
Subject: [PATCH] Account for oslo_config deprecations in aodh.conf template

Specific changes are based on the aodh-api log noting:
 * Option "auth_plugin" from group "keystone_authtoken" is deprecated. Use
   option "auth_type" from group "keystone_authtoken".
 * Option "username" from group "keystone_authtoken" is deprecated. Use option
   "user-name" from group "keystone_authtoken".

Change-Id: I295ed77d88daa1b4844eb8efde628fecdad94c03
---
 templates/aodh.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/aodh.conf.j2 b/templates/aodh.conf.j2
index 923b9ce..3f6588b 100644
--- a/templates/aodh.conf.j2
+++ b/templates/aodh.conf.j2
@@ -23,14 +23,14 @@ connection = {{ aodh_connection_string }}
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}
-auth_plugin = {{ aodh_keystone_auth_plugin }}
+auth_type = {{ aodh_keystone_auth_plugin }}
 signing_dir = {{ aodh_system_user_home }}/cache/api
 auth_url = {{ keystone_service_adminuri }}
 auth_uri = {{ keystone_service_internaluri }}
 project_domain_id = {{ aodh_service_project_domain_id }}
 user_domain_id = {{ aodh_service_user_domain_id }}
 project_name = {{ aodh_service_project_name }}
-username = {{ aodh_service_user_name }}
+user-name = {{ aodh_service_user_name }}
 password = {{ aodh_service_password }}
 
 memcached_servers = {{ memcached_servers }}