Add extra swift features

Enable various swift middleware and options, a default tempest run is
expecting these to be present. With these changes all of the swift
tempest tests pass.

Also reordered the sections in proxy-server.conf to match the pipeline
order and removed the proxy-logging section which was unused.

Change-Id: I12406d5b64fb4595a0498abb8d50d2e33f88a147
This commit is contained in:
Derek Higgins 2013-12-11 14:30:22 +00:00
parent c078a9dfcb
commit 8d332fcc37
2 changed files with 32 additions and 12 deletions

View File

@ -2,14 +2,7 @@
bind_port = 8080
[pipeline:main]
pipeline = catch_errors healthcheck cache authtoken keystoneauth proxy-server
[app:proxy-server]
use = egg:swift#proxy
account_autocreate = true
[filter:cache]
use = egg:swift#memcache
pipeline = catch_errors healthcheck cache slo crossdomain tempurl formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-server
[filter:catch_errors]
use = egg:swift#catch_errors
@ -17,11 +10,20 @@ use = egg:swift#catch_errors
[filter:healthcheck]
use = egg:swift#healthcheck
[filter:proxy-logging]
use = egg:swift#proxy_logging
[filter:cache]
use = egg:swift#memcache
[filter:keystoneauth]
use = egg:swift#keystoneauth
[filter:slo]
use = egg:swift#slo
[filter:crossdomain]
use = egg:swift#crossdomain
[filter:tempurl]
use = egg:swift#tempurl
[filter:formpost]
use = egg:swift#formpost
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
@ -32,3 +34,20 @@ admin_tenant_name = service
admin_user = swift
admin_password = {{swift.service-password}}
auth_uri = http://{{keystone.host}}:5000/v2.0
delay_auth_decision = true
[filter:keystoneauth]
use = egg:swift#keystoneauth
[filter:staticweb]
use = egg:swift#staticweb
[filter:container-quotas]
use = egg:swift#container_quotas
[filter:account-quotas]
use = egg:swift#account_quotas
[app:proxy-server]
use = egg:swift#proxy
account_autocreate = true

View File

@ -13,3 +13,4 @@ use = egg:swift#recon
[app:container-server]
use = egg:swift#container
allow_versions = true