| commit | 3f2fafc83a37ae8a120a72ae0e6d00bff1afd1f3 | [log] [tgz] |
|---|---|---|
| author | Zuul <zuul@review.opendev.org> | Thu Jun 04 21:26:28 2020 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jun 04 21:26:28 2020 +0000 |
| tree | 95acd2b10b3b36d45a3d2f0132eeb867cbfd0490 | |
| parent | 4c0a8f2eef1ffb2d62451dd289d4b2b591e4516e [diff] | |
| parent | 5b48e362af72bfc960d64c2a69b005856af47863 [diff] |
Merge "swift: Fix s3api/keystone interaction"
diff --git a/lib/swift b/lib/swift index 5be9e35..b6c06c5 100644 --- a/lib/swift +++ b/lib/swift
@@ -428,10 +428,11 @@ swift_pipeline+=" s3api" fi if is_service_enabled keystone; then + swift_pipeline+=" authtoken" if is_service_enabled s3api;then swift_pipeline+=" s3token" fi - swift_pipeline+=" authtoken keystoneauth" + swift_pipeline+=" keystoneauth" fi swift_pipeline+=" tempauth "