summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-06-07 18:58:39 +0000
committerGerrit Code Review <review@openstack.org>2020-06-07 18:58:39 +0000
commitb51dfcb45cf3f3d1a9506bf20056c26d8625e283 (patch)
tree646105bcc5bec9f506206d919f7c5ae58710af4d /roles
parent119fd25ca55479ba60070305c3ee0c25f24b43ee (diff)
parenta2feefb0453e387bd281b22f6f33d861272c8e2e (diff)
downloadswift-b51dfcb45cf3f3d1a9506bf20056c26d8625e283.tar.gz
Merge "dsvm: Use devstack's s3api "service""
Diffstat (limited to 'roles')
-rw-r--r--roles/dsvm-additional-middlewares/tasks/main.yaml23
1 files changed, 0 insertions, 23 deletions
diff --git a/roles/dsvm-additional-middlewares/tasks/main.yaml b/roles/dsvm-additional-middlewares/tasks/main.yaml
index 70ef7ae08..42db2701c 100644
--- a/roles/dsvm-additional-middlewares/tasks/main.yaml
+++ b/roles/dsvm-additional-middlewares/tasks/main.yaml
@@ -5,13 +5,6 @@
replace: "cache domain_remap etag-quoter listing_formats"
become: true
-- name: Add s3api and s3token to pipeline
- replace:
- path: "/etc/swift/proxy-server.conf"
- regexp: "authtoken keystoneauth tempauth"
- replace: "authtoken s3api s3token keystoneauth tempauth"
- become: true
-
- name: Set domain_remap domain
ini_file:
path: /etc/swift/proxy-server.conf
@@ -52,22 +45,6 @@
value: true
become: true
-- name: Configure s3token auth_uri
- ini_file:
- path: /etc/swift/proxy-server.conf
- section: filter:s3token
- option: auth_uri
- value: http://localhost/identity/v3
- become: true
-
-- name: Configure s3token delay_auth_decision
- ini_file:
- path: /etc/swift/proxy-server.conf
- section: filter:s3token
- option: delay_auth_decision
- value: true
- become: true
-
- name: Copy ring for Policy-1
copy:
remote_src: true