From: Dan Prince <dprince@redhat.com>
Date: Sun, 20 Oct 2013 15:47:16 +0000 (-0400)
Subject: Drop auth_token configs for api-paste.ini.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5d04c6d1df953c5beefe751ff8e9c332e25b2661;p=openstack-build%2Fcinder-build.git

Drop auth_token configs for api-paste.ini.

We now prefer to use cinder.conf to configure keystoneclients
auth_token configs.

Also, Devstack has now been update to allow this:

https://review.openstack.org/#/c/52259/

Related-Bug #1240753

Change-Id: I2a4b300af37eddf5010b97ca796f0552941642a8
---

diff --git a/etc/cinder/api-paste.ini b/etc/cinder/api-paste.ini
index fb56d68b4..5bfd73822 100644
--- a/etc/cinder/api-paste.ini
+++ b/etc/cinder/api-paste.ini
@@ -50,13 +50,3 @@ paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
 
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
-# signing_dir is configurable, but the default behavior of the authtoken
-# middleware should be sufficient.  It will create a temporary directory
-# in the home directory for the user the cinder process is running as.
-#signing_dir = /var/lib/cinder/keystone-signing