From c47f9bd1962a05a47f05712e69b917afd0ff6503 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 16 Oct 2013 21:09:45 -0400
Subject: [PATCH] Use cinder.conf for auth_token configs.

Updates the cinder element so that we use the application config file
(cinder.conf) instead of the Cinder api-paste.ini config file.

Related-Bug: #1240753

Change-Id: I6636d33ee522757145ac97fc354324a8b9379700
---
 .../cinder/os-config-applier/etc/cinder/api-paste.ini |  9 ---------
 .../cinder/os-config-applier/etc/cinder/cinder.conf   | 11 +++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/elements/cinder/os-config-applier/etc/cinder/api-paste.ini b/elements/cinder/os-config-applier/etc/cinder/api-paste.ini
index e4b45ca98..5bfd73822 100644
--- a/elements/cinder/os-config-applier/etc/cinder/api-paste.ini
+++ b/elements/cinder/os-config-applier/etc/cinder/api-paste.ini
@@ -50,12 +50,3 @@ paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
 
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-service_protocol = http
-service_host = {{keystone.host}}
-service_port = 5000
-auth_host = {{keystone.host}}
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = service
-admin_user = cinder
-admin_password = {{cinder.service-password}}
diff --git a/elements/cinder/os-config-applier/etc/cinder/cinder.conf b/elements/cinder/os-config-applier/etc/cinder/cinder.conf
index 2406ef2bf..6a38dff1b 100644
--- a/elements/cinder/os-config-applier/etc/cinder/cinder.conf
+++ b/elements/cinder/os-config-applier/etc/cinder/cinder.conf
@@ -28,3 +28,14 @@ qpid_port = 5672
 qpid_username = {{username}}
 qpid_password = {{password}}
 {{/qpid}}
+
+[keystone_authtoken]
+service_protocol = http
+service_host = {{keystone.host}}
+service_port = 5000
+auth_host = {{keystone.host}}
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = service
+admin_user = cinder
+admin_password = {{cinder.service-password}}