From eeff73379917a0a5505f9d064c566976c982c62c Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Mon, 17 Nov 2014 13:33:36 +0000
Subject: [PATCH] Use identity_uri instead of auth fragments for swift-proxy

* Change proxy-server.conf to use identity_uri
* Remove auth fragment lines from the conf file

Fixes #554
---
 .../roles/swift_proxy/templates/proxy-server.conf.j2        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rpc_deployment/roles/swift_proxy/templates/proxy-server.conf.j2 b/rpc_deployment/roles/swift_proxy/templates/proxy-server.conf.j2
index 9822d6b75f..a9228a55de 100644
--- a/rpc_deployment/roles/swift_proxy/templates/proxy-server.conf.j2
+++ b/rpc_deployment/roles/swift_proxy/templates/proxy-server.conf.j2
@@ -274,10 +274,8 @@ user_test_tester3 = testing3
 {% if authtoken_active %}
 [filter:authtoken]
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-auth_host = {{ auth_host }}
-auth_port = {{ auth_port }}
-auth_protocol = {{ auth_protocol }}
-auth_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
+identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
+auth_uri = {{ auth_identity_uri }}
 admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}