qa/rgw: configure sts for all suites that run s3tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/cloud-transition/overrides.yaml b/qa/suites/rgw/cloud-transition/overrides.yaml
index 40ca3556b880ab25ea3b0e2f28d0ca0913880a14..1169ccf1fff6a91d762e22454ff67105b85ec38b 100644 (file)
--- 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 764d216aadecd27f777f301a0ed5cd0eb63b070b..4afb49ad027dc7e506af1bb23c10e2a5a50d37f1 100644 (file)
--- 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 dc71a035f83141923e83349cb1dd057e28649552..15eb82784198ec179f3ce9f6dfa959a075827961 100644 (file)
--- 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 9557da444fbb7c19f8f4650e733464d90b10a1af..05478e9e32fa3fc143bb96b25c751726ce90372b 100644 (file)
--- 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 26de9381d126aa6cec504d445e53feb484900dc4..dfca36f782768b39c3a5c43aea7aef7de8067aed 100644 (file)
--- 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 f1ee8a17c4ceae9a7fe20ea39f1cd10af4a30aab..4efb579fa8344931c2dd55ab9f94fa6ca04a818a 100644 (file)
--- 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 628717a3b397021a2f60b8d8a52429d20a5fa362..0bcd000b6baae189b77a5b510776b90b7c4ea9f9 100644 (file)
--- 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 cff73dc660e1362919b8e199e2caad21dbecd9cd..71c8ad97c4eae7ab587cfc2d2ef932663fa5f5d1 100644 (file)
--- 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 ec777440839ba6d38455d2d024c92ff0f460f543..5e7a1b591f096f30e79fe858e6a34599b48665f9 100644 (file)
--- 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: