remove overrides from multisite config

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/qa/suites/smoke/multisite/rgw.yaml b/qa/suites/smoke/multisite/rgw.yaml
index 21a6f3fdc257ec1a1f6ac62d921741d9da59cb91..b9d136465b59ebc6b0e0db24fd3365fa511f1c87 100644 (file)
--- a/qa/suites/smoke/multisite/rgw.yaml
+++ b/qa/suites/smoke/multisite/rgw.yaml
@@ -1,62 +1,3 @@
-overrides:
-  admin_socket:
-    branch: jewel
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug ms: 1
-        debug paxos: 20
-      osd:
-        debug filestore: 20
-        debug journal: 20
-        debug ms: 1
-        debug osd: 25
-    log-whitelist:
-    - slow request
-    sha1: 0c83eb355e989fb6ed38a3b82f9705fd5d700e89
-  ceph-ansible:
-      group_vars:
-        all:
-          ceph_conf_overrides:
-            global:
-              osd_default_pool_size: 2
-              osd_pool_default_pg_num: 128
-              osd_pool_default_pgp_num: 128
-      osd_auto_discovery: false
-      rhbuild: '2.3'
-      setup-clients: true
-      vars:
-        ceph_origin: distro
-        ceph_stable: true
-        ceph_stable_rh_storage: true
-        ceph_test: true
-        journal_collocation: true
-        journal_size: 1024
-        osd_auto_discovery: false
-  ceph-deploy:
-    conf:
-      client:
-        log file: /var/log/ceph/ceph-$name.$pid.log
-      global:
-        mon osd allow primary affinity: true
-      mon:
-        osd default pool size: 2
-    rhbuild: true
-  install:
-    ceph:
-      deb-gpg-key: http://download.eng.bos.redhat.com/rcm-guest/ceph-drops/2.0.0/latest-Ceph-2-Ubuntu/MON/release.asc
-      deb-repo: http://download.eng.bos.redhat.com/rcm-guest/ceph-drops/2.0.0/latest-Ceph-2-Ubuntu
-      fs: xfs
-      rhbuild: '2.3'
-      sha1: 41fcf740ba9205c08a2995fd69dc29051ed81b6a
-  selinux:
-    whitelist:
-    - /home/ubuntu/cephtest/
-    - /var/lib/ceph/tmp/ceph-disk.activate.lock
-  workunit:
-    branch: jewel
-    sha1: 0c83eb355e989fb6ed38a3b82f9705fd5d700e89
 roles:
 - - source.mon.a
 - - source.osd.0