[openstack-swift/f19: 4/4] Grizzly changes

[Derek Higgins]

commit d751356199f4e4e1532a016e8945d20fed93293c
Author: Derek Higgins <derekh at redhat.com>
Date:   Fri Apr 5 01:57:32 2013 +0100

    Grizzly changes
    
    change path to middleware in proxy conf file
    add dependency for python-keystoneclient for proxy

 openstack-swift.spec |    7 ++++++-
 proxy-server.conf    |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/openstack-swift.spec b/openstack-swift.spec
index b73c157..0dee9d0 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -4,7 +4,7 @@
 
 Name:             openstack-swift
 Version:          1.8.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -126,6 +126,7 @@ Summary:          A proxy server for Swift
 Group:            Applications/System
 
 Requires:         %{name} = %{version}-%{release}
+Requires:         python-keystoneclient
 
 %description      proxy
 OpenStack Object Storage (Swift) aggregates commodity servers to work together
@@ -442,6 +443,10 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Apr 05 2013 Derek Higgins <derekh at redhat.com> - 1.8.0-2
+- change path to middleware in proxy conf file
+- add dependency for python-keystoneclient for proxy
+
 * Thu Apr 4 2013 Pete Zaitcev <zaitcev at redhat.com> 1.8.0-1
 - Update to 1.8.0; this is the "Grizzly" release of OpenStack
 
diff --git a/proxy-server.conf b/proxy-server.conf
index 3e4b88a..0726b0e 100644
--- a/proxy-server.conf
+++ b/proxy-server.conf
@@ -22,13 +22,13 @@ use = egg:swift#catch_errors
 use = egg:swift#healthcheck
 
 [filter:keystone]
-paste.filter_factory = keystone.middleware.swift_auth:filter_factory
+use = egg:swift#keystoneauth
 operator_roles = admin, SwiftOperator
 is_admin = true
 cache = swift.cache
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%