qa/rgw: reenable wait-for-scrub

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

diff --git a/qa/suites/rgw/crypt/1-ceph-install/install.yaml b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
index 07a08b9a6b9dc2be1c7a7d1fc18d137880b19f5d..2030acb90836ccb748eab56844f8342763b3dd8c 100644 (file)
--- a/qa/suites/rgw/crypt/1-ceph-install/install.yaml
+++ b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
@@ -1,7 +1,3 @@
-overrides:
-  ceph:
-    wait-for-scrub: false
-
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml
index 83722d31252e1e99427c46a2eac193808d80179e..9557da444fbb7c19f8f4650e733464d90b10a1af 100644 (file)
--- a/qa/suites/rgw/lifecycle/overrides.yaml
+++ b/qa/suites/rgw/lifecycle/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml
index 1cb489072f90562476d98ca781de1644afc4f9b1..de10692b94162b33f41f718af38b736a526236da 100644 (file)
--- a/qa/suites/rgw/multifs/overrides.yaml
+++ b/qa/suites/rgw/multifs/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml
index 76c14eb911cc9af39a84045ab490c14afab3bdf2..a1559e1fe1aa02fe7affaa823ebe53cd3a76340b 100644 (file)
--- a/qa/suites/rgw/multisite/overrides.yaml
+++ b/qa/suites/rgw/multisite/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/notifications/overrides.yaml b/qa/suites/rgw/notifications/overrides.yaml
index 1cb489072f90562476d98ca781de1644afc4f9b1..de10692b94162b33f41f718af38b736a526236da 100644 (file)
--- a/qa/suites/rgw/notifications/overrides.yaml
+++ b/qa/suites/rgw/notifications/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/singleton/overrides.yaml b/qa/suites/rgw/singleton/overrides.yaml
index d2aea790aecf913520fbf86150f5ea597b13e3ce..e7a292ffd1fd94a63456de040daab18175439a9e 100644 (file)
--- a/qa/suites/rgw/singleton/overrides.yaml
+++ b/qa/suites/rgw/singleton/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml
index 1cb489072f90562476d98ca781de1644afc4f9b1..de10692b94162b33f41f718af38b736a526236da 100644 (file)
--- a/qa/suites/rgw/sts/overrides.yaml
+++ b/qa/suites/rgw/sts/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph

diff --git a/qa/suites/rgw/upgrade/overrides.yaml b/qa/suites/rgw/upgrade/overrides.yaml
index 00592d45947764060cf6d0957fac2956638e77bc..8284d8a57fe3dd9013fc7bb09f876c79fab3926e 100644 (file)
--- a/qa/suites/rgw/upgrade/overrides.yaml
+++ b/qa/suites/rgw/upgrade/overrides.yaml
@@ -9,7 +9,6 @@ overrides:
       - \(PG_DEGRADED\)
       - slow request
       - failed to encode map
-    wait-for-scrub: false
     conf:
       mon:
         mon warn on osd down out interval zero: false