From e1222c7433c4cdae74efb6c01da3d0bbfd1e1032 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 25 Mar 2015 08:52:36 +0000
Subject: [PATCH] Remove deprecated config

---
 templates/kilo/proxy-server.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/kilo/proxy-server.conf b/templates/kilo/proxy-server.conf
index 6ca1fb1..6d34e8c 100644
--- a/templates/kilo/proxy-server.conf
+++ b/templates/kilo/proxy-server.conf
@@ -76,7 +76,6 @@ auth_uri = {{ service_protocol }}://{{ service_protocol }}:{{ service_port }}
 admin_tenant_name = {{ service_tenant }}
 admin_user = {{ service_user }}
 admin_password = {{ service_password }}
-admin_token = {{ admin_token }}
 delay_auth_decision = {{ delay_auth_decision|lower }}
 signing_dir = {{ signing_dir }}
 cache = swift.cache
@@ -85,8 +84,9 @@ cache = swift.cache
 paste.filter_factory = keystonemiddleware.s3_token:filter_factory
 identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
 auth_uri = {{ service_protocol }}://{{ service_protocol }}:{{ service_port }}
-auth_token = {{ admin_token }}
-admin_token = {{ admin_token }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_user }}
+admin_password = {{ service_password }}
 
 [filter:swift3]
 use = egg:swift3#swift3