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
This commit is contained in:
Tim Burke 2020-05-26 16:27:38 -07:00 committed by Tim Burke
parent bb9b0326fd
commit a2feefb045
2 changed files with 1 additions and 23 deletions

View File

@ -258,6 +258,7 @@
devstack_services:
keystone: true
swift: true
s3api: true
zuul_work_dir: src/opendev.org/openstack/swift
pre-run: tools/playbooks/dsvm/pre.yaml
run: tools/playbooks/dsvm/run.yaml

View File

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