From f034a7efcd9faec514558ff713a8d6840ed61972 Mon Sep 17 00:00:00 2001
From: "gokhan.isik" <gokhan.isik@tubitak.gov.tr>
Date: Tue, 21 Nov 2017 15:14:44 +0300
Subject: [PATCH] Change auth config to keystone v3 according to openstack
 ocata aodh docs[1], we modified auth config under the "keystone_authtoken"
 and "service_credentials" groups. [1]
 https://docs.openstack.org/project-install-guide/telemetry-alarming/ \
 ocata/install-rdo.html#install-and-configure-components

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

diff --git a/templates/aodh.conf.j2 b/templates/aodh.conf.j2
index eefef61..532e54c 100644
--- a/templates/aodh.conf.j2
+++ b/templates/aodh.conf.j2
@@ -27,6 +27,7 @@ project_name = {{ aodh_service_project_name }}
 username = {{ aodh_service_user_name }}
 password = {{ aodh_service_password }}
 region_name = {{ keystone_service_region }}
+interface = {{ aodh_service_endpoint_type }}
 
 memcached_servers = {{ memcached_servers }}
 
@@ -37,9 +38,14 @@ memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcached_encryption_key }}
 
 [service_credentials]
-os_auth_url = {{ keystone_service_internalurl }}
-os_username = {{ aodh_service_user_name }}
-os_tenant_name = {{ aodh_service_tenant_name }}
-os_password = {{ aodh_service_password }}
+insecure = {{ keystone_service_internaluri_insecure | bool }}
+auth_type = {{ aodh_keystone_auth_plugin }}
+auth_url = {{ keystone_service_internalurl }}
+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 }}
+tenant_name = {{ aodh_service_tenant_name }}
+password = {{ aodh_service_password }}
 region_name = {{ aodh_service_region }}
 interface = {{ aodh_service_endpoint_type }}