qa/rgw/sts: move overrides into overrides.yaml

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

diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml
index de10692b94162b33f41f718af38b736a526236da..98d1952bf9b4083cd66f847ba07def820fe5364b 100644 (file)
--- a/qa/suites/rgw/sts/overrides.yaml
+++ b/qa/suites/rgw/sts/overrides.yaml
@@ -1,6 +1,9 @@
 overrides:
   ceph:
     conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
       client:
         setuser: ceph
         setgroup: ceph
@@ -8,5 +11,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 lc debug interval: 10
+        rgw sts key: abcdefghijklmnop
+        rgw s3 auth use sts: true
   rgw:
     storage classes: LUKEWARM, FROZEN

diff --git a/qa/suites/rgw/sts/tasks/0-install.yaml b/qa/suites/rgw/sts/tasks/0-install.yaml
index 013ccbd26feaf313c357d3578f879825fd8198c7..54c2661bad7718174be777b3c2f1bdacddf6f101 100644 (file)
--- a/qa/suites/rgw/sts/tasks/0-install.yaml
+++ b/qa/suites/rgw/sts/tasks/0-install.yaml
@@ -4,12 +4,3 @@ tasks:
 - openssl_keys:
 - rgw:
     client.0:
-
-overrides:
-  ceph:
-    conf:
-      global:
-        osd_min_pg_log_entries: 10
-        osd_max_pg_log_entries: 10
-      client:
-        rgw lc debug interval: 10

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
index 2b961baa64b86b21ca94653ed079d35c99463d84..d15f53335d5f538d2965fc032da187fad230c2d8 100644 (file)
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -8,9 +8,3 @@ tasks:
       sts_tests: True
       webidentity_tests: True
       rgw_server: client.0
-overrides:
-  ceph:
-    conf:
-      client:
-              rgw sts key: abcdefghijklmnop
-              rgw s3 auth use sts: true

diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml
index 1e3e9098991b6d303fcda7cbc2378bcd67c7b3ff..d40d7c3b37aa85bebbd17ec88fbf87ff751c52d6 100644 (file)
--- a/qa/suites/rgw/sts/tasks/ststests.yaml
+++ b/qa/suites/rgw/sts/tasks/ststests.yaml
@@ -3,9 +3,3 @@ tasks:
     client.0:
       sts_tests: True
       rgw_server: client.0
-overrides:
-  ceph:
-    conf:
-      client:
-              rgw sts key: abcdefghijklmnop
-              rgw s3 auth use sts: true