From 17486bddda772eadce909daefabe39884e0ba57a Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 27 Jun 2023 16:55:23 -0400 Subject: [PATCH] qa/rgw/sts: move overrides into overrides.yaml Signed-off-by: Casey Bodley --- qa/suites/rgw/sts/overrides.yaml | 6 ++++++ qa/suites/rgw/sts/tasks/0-install.yaml | 9 --------- qa/suites/rgw/sts/tasks/first.yaml | 6 ------ qa/suites/rgw/sts/tasks/ststests.yaml | 6 ------ 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml index de10692b941..98d1952bf9b 100644 --- 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 013ccbd26fe..54c2661bad7 100644 --- 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 2b961baa64b..d15f53335d5 100644 --- 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 1e3e9098991..d40d7c3b37a 100644 --- 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 -- 2.47.3