From 449a1561b24b480a6c33008bdffb7643dc283288 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 17 Apr 2020 10:45:15 -0400 Subject: [PATCH] qa/rgw: add setuser/group to test DEFER_DROP_PRIVILEGES Signed-off-by: Casey Bodley (cherry picked from commit 94ca8f4b81f6e1c546a4c50c401d1ffde48be0fb) --- qa/suites/rgw/crypt/3-rgw/rgw.yaml | 2 ++ qa/suites/rgw/hadoop-s3a/overrides.yaml | 6 ++++++ qa/suites/rgw/multifs/overrides.yaml | 2 ++ qa/suites/rgw/multisite/overrides.yaml | 2 ++ qa/suites/rgw/singleton/overrides.yaml | 2 ++ qa/suites/rgw/tempest/overrides.yaml | 6 ++++++ qa/suites/rgw/thrash/civetweb.yaml | 5 +++++ qa/suites/rgw/verify/overrides.yaml | 2 ++ qa/suites/rgw/website/overrides.yaml | 2 ++ 9 files changed, 29 insertions(+) create mode 100644 qa/suites/rgw/hadoop-s3a/overrides.yaml create mode 100644 qa/suites/rgw/tempest/overrides.yaml diff --git a/qa/suites/rgw/crypt/3-rgw/rgw.yaml b/qa/suites/rgw/crypt/3-rgw/rgw.yaml index 4d14dcf04acbb..ee8d62af05c83 100644 --- a/qa/suites/rgw/crypt/3-rgw/rgw.yaml +++ b/qa/suites/rgw/crypt/3-rgw/rgw.yaml @@ -2,6 +2,8 @@ overrides: ceph: conf: client: + setuser: ceph + setgroup: ceph rgw crypt require ssl: false debug rgw: 20 diff --git a/qa/suites/rgw/hadoop-s3a/overrides.yaml b/qa/suites/rgw/hadoop-s3a/overrides.yaml new file mode 100644 index 0000000000000..d52080bb5a1f3 --- /dev/null +++ b/qa/suites/rgw/hadoop-s3a/overrides.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + setuser: ceph + setgroup: ceph diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml index 038a9c9c69f84..1cb489072f905 100644 --- a/qa/suites/rgw/multifs/overrides.yaml +++ b/qa/suites/rgw/multifs/overrides.yaml @@ -3,6 +3,8 @@ overrides: wait-for-scrub: false conf: client: + setuser: ceph + setgroup: ceph debug rgw: 20 rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml index 9c383fc78daef..54e3db24f24c8 100644 --- a/qa/suites/rgw/multisite/overrides.yaml +++ b/qa/suites/rgw/multisite/overrides.yaml @@ -3,6 +3,8 @@ overrides: wait-for-scrub: false conf: client: + setuser: ceph + setgroup: ceph debug rgw: 20 rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= diff --git a/qa/suites/rgw/singleton/overrides.yaml b/qa/suites/rgw/singleton/overrides.yaml index ed4ad591da993..d2aea790aecf9 100644 --- a/qa/suites/rgw/singleton/overrides.yaml +++ b/qa/suites/rgw/singleton/overrides.yaml @@ -3,4 +3,6 @@ overrides: wait-for-scrub: false conf: client: + setuser: ceph + setgroup: ceph debug rgw: 20 diff --git a/qa/suites/rgw/tempest/overrides.yaml b/qa/suites/rgw/tempest/overrides.yaml new file mode 100644 index 0000000000000..d52080bb5a1f3 --- /dev/null +++ b/qa/suites/rgw/tempest/overrides.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + setuser: ceph + setgroup: ceph diff --git a/qa/suites/rgw/thrash/civetweb.yaml b/qa/suites/rgw/thrash/civetweb.yaml index 5845a0e6c15cf..db4b04339131d 100644 --- a/qa/suites/rgw/thrash/civetweb.yaml +++ b/qa/suites/rgw/thrash/civetweb.yaml @@ -1,3 +1,8 @@ overrides: + ceph: + conf: + client: + setuser: ceph + setgroup: ceph rgw: frontend: civetweb diff --git a/qa/suites/rgw/verify/overrides.yaml b/qa/suites/rgw/verify/overrides.yaml index 12d32becaca0f..aefee7b70ecc6 100644 --- a/qa/suites/rgw/verify/overrides.yaml +++ b/qa/suites/rgw/verify/overrides.yaml @@ -2,6 +2,8 @@ overrides: ceph: conf: client: + setuser: ceph + setgroup: ceph debug rgw: 20 rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml index 57fb5d0338e3b..0eb474980f57e 100644 --- a/qa/suites/rgw/website/overrides.yaml +++ b/qa/suites/rgw/website/overrides.yaml @@ -11,6 +11,8 @@ overrides: osd_min_pg_log_entries: 10 osd_max_pg_log_entries: 10 client: + setuser: ceph + setgroup: ceph debug rgw: 20 rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= -- 2.39.5