qa/suites/rados: move valgrind test to singleton-flat

No distro facet (or anything else) since we require centos for this test.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/singleton-flat/valgrind-leaks.yaml b/qa/suites/rados/singleton-flat/valgrind-leaks.yaml
new file mode 100644 (file)
index 0000000..e70a5e4
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/valgrind-leaks.yaml
@@ -0,0 +1,34 @@
+# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
+os_type: centos
+
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
+
+overrides:
+  install:
+    ceph:
+      flavor: notcmalloc
+      debuginfo: true
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(PG_
+    conf:
+      global:
+        osd heartbeat grace: 40
+        debug deliberately leak memory: true
+        osd max object name len: 460
+        osd max object namespace len: 64
+      mon:
+        mon osd crush smoke test: false
+    valgrind:
+      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
+      osd: [--tool=memcheck]
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+    expect_valgrind_errors: true

diff --git a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
deleted file mode 100644 (file)
index e70a5e4..0000000
--- a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
-
-openstack:
-  - volumes: # attached to each instance
-      count: 2
-      size: 10 # GB
-
-overrides:
-  install:
-    ceph:
-      flavor: notcmalloc
-      debuginfo: true
-  ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(PG_
-    conf:
-      global:
-        osd heartbeat grace: 40
-        debug deliberately leak memory: true
-        osd max object name len: 460
-        osd max object namespace len: 64
-      mon:
-        mon osd crush smoke test: false
-    valgrind:
-      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-      osd: [--tool=memcheck]
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-tasks:
-- install:
-- ceph:
-    expect_valgrind_errors: true