summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2020-05-26 16:27:38 -0700
committerTim Burke <tburke@nvidia.com>2020-05-27 03:12:50 +0000
commita2feefb0453e387bd281b22f6f33d861272c8e2e (patch)
treebeadd9a7c23a2fc1919d8af35b26e24b0dc73ec7 /roles
parentbb9b0326fde08768e6d609a210a1d1a5ec1c32ff (diff)
downloadswift-a2feefb0453e387bd281b22f6f33d861272c8e2e.tar.gz
dsvm: Use devstack's s3api "service"
...instead of hacking up the pipeline ourselves. Depends-On: https://review.opendev.org/731003 Depends-On: https://review.opendev.org/731065 Change-Id: Iea8a42ef54e1a2fd9c1d6132c840a20015cc5d7e
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 66e186a3f..176f68ccd 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
@@ -44,22 +37,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