multimds: factor install+ceph tasks out of other collections

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

diff --git a/suites/multimds/basic/ceph/base.yaml b/suites/multimds/basic/ceph/base.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/suites/multimds/basic/ceph/base.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

diff --git a/suites/multimds/basic/inline/no.yaml b/suites/multimds/basic/inline/no.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/suites/multimds/basic/inline/no.yaml
+++ b/suites/multimds/basic/inline/no.yaml
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/suites/multimds/basic/inline/yes.yaml b/suites/multimds/basic/inline/yes.yaml
index 72a285c590fb4457607563938a54b0c4f84d89cc..4b2c1d9cf49cf75e7e806dc8d1ce41b2865957d1 100644 (file)
--- a/suites/multimds/basic/inline/yes.yaml
+++ b/suites/multimds/basic/inline/yes.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - exec:
     client.0:
       - ceph mds set inline_data true --yes-i-really-mean-it

diff --git a/suites/multimds/libcephfs/ceph/base.yaml b/suites/multimds/libcephfs/ceph/base.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/suites/multimds/libcephfs/ceph/base.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

diff --git a/suites/multimds/libcephfs/inline/no.yaml b/suites/multimds/libcephfs/inline/no.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/suites/multimds/libcephfs/inline/no.yaml
+++ b/suites/multimds/libcephfs/inline/no.yaml
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/suites/multimds/libcephfs/inline/yes.yaml b/suites/multimds/libcephfs/inline/yes.yaml
index 72a285c590fb4457607563938a54b0c4f84d89cc..4b2c1d9cf49cf75e7e806dc8d1ce41b2865957d1 100644 (file)
--- a/suites/multimds/libcephfs/inline/yes.yaml
+++ b/suites/multimds/libcephfs/inline/yes.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - exec:
     client.0:
       - ceph mds set inline_data true --yes-i-really-mean-it

diff --git a/suites/multimds/verify/ceph/base.yaml b/suites/multimds/verify/ceph/base.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/suites/multimds/verify/ceph/base.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml
index 73319776f038e135a4075d32390f34a9c3eea5b3..ad96b4c5e7fcfe50492affcd7ca05f528dda3721 100644 (file)
--- a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml
@@ -1,10 +1,4 @@
 tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        debug client: 1/20
-        debug ms: 0/10
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml
index b58487c0785328ab40782180a534b057e68edff9..5908d951b2df0add0792c67e8db89d9e9abc15a0 100644 (file)
--- a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml b/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml
index 22d1f1421616822236fe4ad54491da548feb01e4..0b1d41fea5c444e51203829976e0ce8f163b4d27 100644 (file)
--- a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml
+++ b/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients: