qa/suites/rados/rest: move rest_test from qa/suites/rest/

...and add more health whitelists.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ddb274669ca16b95c452b256e58a2830af10c73d)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/qa/suites/rados/rest/rest_test.yaml b/qa/suites/rados/rest/rest_test.yaml
new file mode 100644 (file)
index 0000000..0fdb9dc
--- /dev/null
+++ b/qa/suites/rados/rest/rest_test.yaml
@@ -0,0 +1,44 @@
+roles:
+- - mon.a
+  - mgr.x
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+  - client.0
+
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+
+tasks:
+- install:
+- ceph:
+    fs: xfs
+    log-whitelist:
+      - overall HEALTH
+      - \(OSDMAP_FLAGS\)
+      - \(OSD_
+      - \(PG_
+      - \(POOL_
+      - \(CACHE_POOL_
+      - \(SMALLER_PGP_NUM\)
+      - \(OBJECT_
+      - \(REQUEST_SLOW\)
+      - \(SLOW_OPS\)
+      - \(TOO_FEW_PGS\)
+      - but it is still running
+    conf:
+      client.rest0:
+        debug ms: 1
+        debug objecter: 20
+        debug rados: 20
+- rest-api: [client.0]
+- workunit:
+    clients:
+      client.0:
+         - rest/test.py

diff --git a/qa/suites/rest/basic/tasks/rest_test.yaml b/qa/suites/rest/basic/tasks/rest_test.yaml
deleted file mode 100644 (file)
index 30e000d..0000000
--- a/qa/suites/rest/basic/tasks/rest_test.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-  - client.0
-
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-
-tasks:
-- install:
-- ceph:
-    fs: xfs
-    log-whitelist:
-    - \(OSDMAP_FLAGS\)
-    - \(OSD_DOWN\)
-    - but it is still running
-    conf:
-      client.rest0:
-        debug ms: 1
-        debug objecter: 20
-        debug rados: 20
-- rest-api: [client.0]
-- workunit:
-    clients:
-      client.0:
-         - rest/test.py