[openstack-cinder] Move authtoken configuration out of paste.ini

[Pádraig Brady]

commit 8e3b82a254ed49d25ab88b2936621cedcd37f1c6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Sep 17 13:01:24 2012 +0100

    Move authtoken configuration out of paste.ini
    
    Makes use of https://review.openstack.org/#/c/10579/
    to avoid site-specific data in paste.ini files.
    
    To complete Cinder with Keystone configuration:
    openstack-config --set /etc/cinder/cinder.conf DEFAULT auth_strategy keystone
    
    openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_tenant_name SERVICE_TENANT_NAME
    openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_user SERVICE_USER
    openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_password SERVICE_PASSWORD

 cinder.conf           |    9 +++++++++
 openstack-cinder.spec |   15 ++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/cinder.conf b/cinder.conf
index 5b393c2..b554223 100644
--- a/cinder.conf
+++ b/cinder.conf
@@ -6,3 +6,12 @@ iscsi_helper = tgtadm
 sql_connection = mysql://cinder:cinder@localhost/cinder
 rpc_backend = cinder.openstack.common.rpc.impl_qpid
 rootwrap_config = /etc/cinder/rootwrap.conf
+
+[keystone_authtoken]
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_protocol = http
+signing_dirname = /tmp/keystone-signing-cinder
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index e8621d5..5ab2ffe 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-cinder
 Version:          2012.2
-Release:          0.2.f3%{?dist}
+Release:          0.3.f3%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
@@ -30,6 +30,7 @@ BuildRequires:    intltool
 BuildRequires:    python-sphinx
 BuildRequires:    python-setuptools
 BuildRequires:    python-netaddr
+BuildRequires:    openstack-utils
 
 Requires:         openstack-utils
 Requires:         python-cinder = %{version}-%{release}
@@ -123,6 +124,15 @@ find cinder -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
 %build
+
+# Move authtoken configuration out of paste.ini
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken admin_tenant_name
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken admin_user
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken admin_password
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken auth_host
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken auth_port
+openstack-config --del etc/cinder/api-paste.ini filter:authtoken auth_protocol
+
 %{__python} setup.py build
 
 %install
@@ -253,5 +263,8 @@ fi
 %endif
 
 %changelog
+* Mon Sep 17 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.3.f3
+- Move user config out of /etc/cinder/api-paste.ini
+
 * Mon Sep  3 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.2.f3
 - Initial release