Merge "swift: Fix s3api/keystone interaction"

2020-06-04 21:26:28 +00:00 · 2020-06-04 21:26:28 +00:00 · 3f2fafc83a
commit 3f2fafc83a
parent 4c0a8f2eef 5b48e362af
1 changed files with 2 additions and 1 deletions
--- a/lib/swift
+++ b/lib/swift
@ -428,10 +428,11 @@ function configure_swift {
        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 "