From bdfd5fc9fd06aa3f7ac2a513b4154b2f238a91d3 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 21 Sep 2016 07:12:29 +0000
Subject: [PATCH] Fix Keystone v3 integration for Mitaka+

The ceilometer.conf was using its defining its own keystone-authtoken
section which lacks Keystone v3 support rather than using the shared
template fragment from charmhelpers.

Change-Id: I180785aa6b1b89eab7d2d2814206e43b3aa90ff7
Closes-Bug: #1624173
---
 templates/mitaka/ceilometer.conf | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/templates/mitaka/ceilometer.conf b/templates/mitaka/ceilometer.conf
index 1f52659..112a5f4 100644
--- a/templates/mitaka/ceilometer.conf
+++ b/templates/mitaka/ceilometer.conf
@@ -32,13 +32,6 @@ event_time_to_live = {{ event_time_to_live }}
 [publisher]
 telemetry_secret = {{ metering_secret }}
 
-[keystone_authtoken]
-auth_type = password
-auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
-auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/
-project_name = {{ admin_tenant_name }}
-username = {{ admin_user }}
-password = {{ admin_password }}
-signing_dir = {{ signing_dir }}
+{% include "section-keystone-authtoken-mitaka" %}
 
 {% include "section-rabbitmq-oslo" %}