summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-18 16:29:54 +0000
committerGerrit Code Review <review@openstack.org>2019-06-18 16:29:54 +0000
commit1ae4952af404b0e081dc7e64b7925e5be1f9a7e8 (patch)
treed8cbe8aae76dbcb5e53ccbccc3b281d632f2e095 /docker
parent761a16acbabd29019d020447529c1d248b4b1a86 (diff)
parentccd3b890cdddca132b4d9cdd9372a9927bfb5aac (diff)
downloadswift-1ae4952af404b0e081dc7e64b7925e5be1f9a7e8.tar.gz
Merge "Enable s3api in saio docker container"
Diffstat (limited to 'docker')
-rw-r--r--docker/rootfs/etc/swift/proxy-server.conf13
1 files changed, 1 insertions, 12 deletions
diff --git a/docker/rootfs/etc/swift/proxy-server.conf b/docker/rootfs/etc/swift/proxy-server.conf
index 56eb8b0b2..0e7caf7b0 100644
--- a/docker/rootfs/etc/swift/proxy-server.conf
+++ b/docker/rootfs/etc/swift/proxy-server.conf
@@ -9,7 +9,7 @@ log_name = proxy-server
user = swift
[pipeline:main]
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache listing_formats bulk tempurl ratelimit tempauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache listing_formats bulk tempurl ratelimit s3api tempauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
[filter:catch_errors]
use = egg:swift#catch_errors
@@ -35,17 +35,6 @@ use = egg:swift#dlo
[filter:slo]
use = egg:swift#slo
-[filter:container_sync]
-use = egg:swift#container_sync
-current = //saio/saio_endpoint
-
-[filter:s3api]
-use = egg:swift#s3api
-# Add this filter to your pipeline if you want to test with the S3 protocol.
-s3_acl = yes
-dns_compliant_bucket_names = no
-check_bucket_owner = yes
-
[filter:tempurl]
use = egg:swift#tempurl