From fcf65cb399bfa6aec176c4874c247650aae2826f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sat, 24 Feb 2024 10:43:14 -0500 Subject: [PATCH] qa/rgw: configure sts for all suites that run s3tests Signed-off-by: Casey Bodley (cherry picked from commit d853d6dbb939aa5d71ee9dfdee3c47f04a05e27c) --- qa/suites/rgw/cloud-transition/overrides.yaml | 2 ++ qa/suites/rgw/crypt/3-rgw/rgw.yaml | 2 ++ qa/suites/rgw/dbstore/overrides.yaml | 2 ++ qa/suites/rgw/lifecycle/overrides.yaml | 2 ++ qa/suites/rgw/multifs/overrides.yaml | 2 ++ qa/suites/rgw/tempest/tasks/s3tests.yaml | 2 ++ qa/suites/rgw/thrash/workload/rgw_s3tests.yaml | 2 ++ qa/suites/rgw/verify/overrides.yaml | 2 ++ qa/suites/rgw/website/overrides.yaml | 2 ++ 9 files changed, 18 insertions(+) diff --git a/qa/suites/rgw/cloud-transition/overrides.yaml b/qa/suites/rgw/cloud-transition/overrides.yaml index 40ca3556b880a..1169ccf1fff6a 100644 --- a/qa/suites/rgw/cloud-transition/overrides.yaml +++ b/qa/suites/rgw/cloud-transition/overrides.yaml @@ -8,6 +8,8 @@ overrides: rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw lc debug interval: 10 rgw: storage classes: LUKEWARM, FROZEN diff --git a/qa/suites/rgw/crypt/3-rgw/rgw.yaml b/qa/suites/rgw/crypt/3-rgw/rgw.yaml index 764d216aadecd..4afb49ad027dc 100644 --- a/qa/suites/rgw/crypt/3-rgw/rgw.yaml +++ b/qa/suites/rgw/crypt/3-rgw/rgw.yaml @@ -6,6 +6,8 @@ overrides: setgroup: ceph rgw crypt require ssl: false debug rgw: 20 + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw: compression type: random diff --git a/qa/suites/rgw/dbstore/overrides.yaml b/qa/suites/rgw/dbstore/overrides.yaml index dc71a035f8314..15eb82784198e 100644 --- a/qa/suites/rgw/dbstore/overrides.yaml +++ b/qa/suites/rgw/dbstore/overrides.yaml @@ -8,5 +8,7 @@ overrides: rgw crypt require ssl: false rgw config store: dbstore rgw backend store: dbstore + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw: frontend: beast diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml index 9557da444fbb7..05478e9e32fa3 100644 --- a/qa/suites/rgw/lifecycle/overrides.yaml +++ b/qa/suites/rgw/lifecycle/overrides.yaml @@ -8,6 +8,8 @@ overrides: rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw lc debug interval: 10 rgw: storage classes: LUKEWARM, FROZEN diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml index 26de9381d126a..dfca36f782768 100644 --- a/qa/suites/rgw/multifs/overrides.yaml +++ b/qa/suites/rgw/multifs/overrides.yaml @@ -8,6 +8,8 @@ overrides: rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw: storage classes: LUKEWARM, FROZEN s3tests: diff --git a/qa/suites/rgw/tempest/tasks/s3tests.yaml b/qa/suites/rgw/tempest/tasks/s3tests.yaml index f1ee8a17c4cea..4efb579fa8344 100644 --- a/qa/suites/rgw/tempest/tasks/s3tests.yaml +++ b/qa/suites/rgw/tempest/tasks/s3tests.yaml @@ -6,6 +6,8 @@ overrides: rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true keystone: client.0: projects: diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml index 628717a3b3970..0bcd000b6baae 100644 --- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml @@ -10,3 +10,5 @@ overrides: rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true diff --git a/qa/suites/rgw/verify/overrides.yaml b/qa/suites/rgw/verify/overrides.yaml index cff73dc660e13..71c8ad97c4eae 100644 --- a/qa/suites/rgw/verify/overrides.yaml +++ b/qa/suites/rgw/verify/overrides.yaml @@ -11,6 +11,8 @@ overrides: rgw torrent flag: true rgw user counters cache: true rgw bucket counters cache: true + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true rgw: compression type: random storage classes: LUKEWARM, FROZEN diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml index ec777440839ba..5e7a1b591f096 100644 --- a/qa/suites/rgw/website/overrides.yaml +++ b/qa/suites/rgw/website/overrides.yaml @@ -13,6 +13,8 @@ overrides: rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false rgw enable static website: True + rgw sts key: abcdefghijklmnop + rgw s3 auth use sts: true client.1: rgw enable apis: s3website rgw: -- 2.39.5