upgrade: ignore mds restart order on rbd, rados tests

Not relevant to rbd; put these in the fs upgrade matrix.

diff --git a/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index a850835..0000000
--- a/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index a850835..0000000
--- a/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]