From fbddccd5f10a352880607f72804a42daf2d1b9fc Mon Sep 17 00:00:00 2001
From: Benjamin Diaz <bdiaz@whitestack.com>
Date: Fri, 8 Jun 2018 22:52:16 -0300
Subject: [PATCH] Revert "Remove keystone_authtoken section for aodh"

This reverts commit f8fd06011aed5cd9028a8c1e206762a78e137df7.

Based on the code, overall uses service_credentials, but looks like a
few parts is using keystonemiddleware.auth_*

Closes-Bug: #1775956

Change-Id: I766a5624737cae892fe77fa8151b20e0972ed5b2
---
 ansible/roles/aodh/templates/aodh.conf.j2 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2
index 30724cbd21..4fb1b19716 100644
--- a/ansible/roles/aodh/templates/aodh.conf.j2
+++ b/ansible/roles/aodh/templates/aodh.conf.j2
@@ -14,6 +14,19 @@ host = {{ api_interface_address }}
 [database]
 connection = mysql+pymysql://{{ aodh_database_user }}:{{ aodh_database_password }}@{{ aodh_database_address }}/{{ aodh_database_name }}
 
+[keystone_authtoken]
+memcache_security_strategy = ENCRYPT
+memcache_secret_key = {{ memcache_secret_key }}
+memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
+auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+project_domain_name = {{ default_project_domain_name }}
+project_name = service
+user_domain_name = {{ default_user_domain_name }}
+username = {{ aodh_keystone_user }}
+password = {{ aodh_keystone_password }}
+auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+auth_type = password
+
 [oslo_middleware]
 enable_proxy_headers_parsing = True