From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 14 Feb 2018 17:15:47 +0000 (-0500)
Subject: qa/rgw: remove some civetweb overrides for beast testing
X-Git-Tag: v12.2.5~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20736%2Fhead;p=ceph.git

qa/rgw: remove some civetweb overrides for beast testing

these overrides were preventing frontend/beast.yaml from selecting the
beast frontend

Fixes: http://tracker.ceph.com/issues/23002

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 12218eeea96d84df845ff6dab976128889e4c34e)
---

diff --git a/qa/suites/rgw/singleton/overrides.yaml b/qa/suites/rgw/singleton/overrides.yaml
index fc35b09f722..ed4ad591da9 100644
--- a/qa/suites/rgw/singleton/overrides.yaml
+++ b/qa/suites/rgw/singleton/overrides.yaml
@@ -4,5 +4,3 @@ overrides:
     conf:
       client:
         debug rgw: 20
-  rgw:
-    frontend: civetweb
diff --git a/qa/suites/rgw/verify/overrides.yaml b/qa/suites/rgw/verify/overrides.yaml
index a9ffd29bb5b..ed3dec8e2df 100644
--- a/qa/suites/rgw/verify/overrides.yaml
+++ b/qa/suites/rgw/verify/overrides.yaml
@@ -6,5 +6,4 @@ overrides:
         rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
         rgw crypt require ssl: false
   rgw:
-    frontend: civetweb
     compression type: random