x/swift3
Code Issues Proposed changes

Merge "Fix up some warnings"

Browse Source
This commit is contained in:
Jenkins 2016-04-26 17:36:48 +00:00 committed by Gerrit Code Review
commit 32397fba52
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/proxy-server.conf-sample
View File

@ -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

5
swift3/test/functional/conf/keystone.conf.in
View File

@ -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

13
swift3/test/functional/conf/proxy-server.conf.in
View File

@ -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