From 7700d77cd4350d2eec881a8d7c4cc3a371023fbf Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Fri, 18 Mar 2016 16:00:34 -0700
Subject: [PATCH] Fix up some warnings

Specifically, from Swift:

  proxy-server: Adding required filter dlo to pipeline at position 7
  proxy-server: Adding required filter gatekeeper to pipeline at
    position 1
  proxy-server: Pipeline was modified. New pipeline is "catch_errors
    gatekeeper proxy-logging cache swift3 s3token authtoken keystoneauth
    dlo bulk slo proxy-logging proxy-server".

  proxy-server: Starting Keystone auth_token middleware
  proxy-server: Configuring admin URI using auth fragments. This is
    deprecated, use 'identity_uri' instead.

And from Keystone:

  2016-03-18 20:18:19.844 19052 WARNING oslo_config.cfg [-] Option
    "policy_file" from group "DEFAULT" is deprecated. Use option
    "policy_file" from group "oslo_policy".

While we're at it, remove some unused filter config options to reduce
confusion.

Change-Id: I08e76b3bfcc4b59121b7a0d5fedf1f9629d8fb25
---
 etc/proxy-server.conf-sample                  | 19 +++++++++++--------
 swift3/test/functional/conf/keystone.conf.in  |  5 ++++-
 .../test/functional/conf/proxy-server.conf.in | 13 +++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index 9cd2f66d..cbd86c71 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -142,21 +142,24 @@ use = egg:swift#memcache
 [filter:s3token]
 # See swift manual for more details.
 paste.filter_factory = keystonemiddleware.s3_token:filter_factory
+
+# Prefix that will be prepended to the tenant to form the account
+reseller_prefix = AUTH_
+
+# Keystone server details
 auth_host = keystonehost
 auth_port = 35357
 auth_protocol = http
-auth_uri = http://keystonehost:5000/
-admin_tenant_name = service
-admin_user = swift
-admin_password = password
-cache = swift.cache
+
+# SSL-related options
+#insecure = False
+#certfile =
+#keyfile =
 
 [filter:authtoken]
 # See swift manual for more details.
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-auth_host = keystonehost
-auth_port = 35357
-auth_protocol = http
+identity_uri = http://keystonehost:35357/
 auth_uri = http://keystonehost:5000/
 admin_tenant_name = service
 admin_user = swift
diff --git a/swift3/test/functional/conf/keystone.conf.in b/swift3/test/functional/conf/keystone.conf.in
index 09fdb737..a25ea22a 100644
--- a/swift3/test/functional/conf/keystone.conf.in
+++ b/swift3/test/functional/conf/keystone.conf.in
@@ -1,11 +1,14 @@
 [DEFAULT]
-policy_file=%CONF_DIR%/policy.json
 admin_token = ADMIN
 
 [database]
 
 connection=sqlite:///%TEST_DIR%/keystone.db
 
+[oslo_policy]
+
+policy_file=%CONF_DIR%/policy.json
+
 [paste_deploy]
 
 config_file=%CONF_DIR%/keystone-paste.ini
diff --git a/swift3/test/functional/conf/proxy-server.conf.in b/swift3/test/functional/conf/proxy-server.conf.in
index 2469084c..d714f5b3 100644
--- a/swift3/test/functional/conf/proxy-server.conf.in
+++ b/swift3/test/functional/conf/proxy-server.conf.in
@@ -9,7 +9,7 @@ account_autocreate = true
 log_level = DEBUG
 
 [pipeline:main]
-pipeline = catch_errors proxy-logging cache swift3 %MIDDLEWARE% bulk slo proxy-logging proxy-server
+pipeline = catch_errors gatekeeper proxy-logging cache swift3 %MIDDLEWARE% bulk slo dlo proxy-logging proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
@@ -40,6 +40,9 @@ min_segment_size = 4
 [filter:dlo]
 use = egg:swift#dlo
 
+[filter:gatekeeper]
+use = egg:swift#gatekeeper
+
 [filter:cache]
 use = egg:swift#memcache
 
@@ -49,16 +52,10 @@ auth_host = localhost
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://localhost:5000/
-admin_tenant_name = service
-admin_user = swift
-admin_password = password
-cache = swift.cache
 
 [filter:authtoken]
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-auth_host = localhost
-auth_port = 35357
-auth_protocol = http
+identity_uri = http://localhost:35357/
 auth_uri = http://localhost:5000/
 admin_tenant_name = service
 admin_user = swift