From 150a071fa1df1020c18f47eaaa642a846e7da3e6 Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Jan 28 2015 22:28:28 +0000
Subject: Update parameters of authtoken to use identity_uri


Old parameters work for now, but this patch removes a warning that
Keystone middleware spews on startup.

I have verified that the /v2.0 path is not needed and the example
configuration works literally as written.

---

diff --git a/openstack-swift.spec b/openstack-swift.spec
index c149de2..2548425 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -7,7 +7,7 @@
 
 Name:             openstack-swift
 Version:          2.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -476,6 +476,9 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Wed Jan 28 2015 Pete Zaitcev <zaitcev@redhat.com> 2.2.0-4
+- Update parameters to authtoken in proxy-server.conf, upstream review 150832
+
 * Wed Jan 14 2015 Pete Zaitcev <zaitcev@redhat.com> 2.2.0-3
 - Intercept logging to local[012].* because Packstack uses LOCAL1 too (#997983)
 - Move the /var/run conf from /etc/tmpfiles.d to /usr/lib/tmpfiles.d (#1180984)
diff --git a/proxy-server.conf b/proxy-server.conf
index 96262e4..1fc9c82 100644
--- a/proxy-server.conf
+++ b/proxy-server.conf
@@ -35,7 +35,8 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 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
+#
+identity_uri = http://localhost:35357/
+auth_uri = http://localhost:5000/
+#
 signing_dir = /tmp/keystone-signing-swift