6 files changed, 2 insertions, 36 deletions
diff --git a/qa/suites/rbd/migration/5-data-pool b/qa/suites/rbd/migration/5-data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/migration/5-data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
+\ No newline at end of file
diff --git a/qa/suites/rbd/migration/5-pool/.qa b/qa/suites/rbd/migration/5-pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/migration/5-pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
-\ No newline at end of file
diff --git a/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml b/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml
deleted file mode 100644
index f39a5bb4ca6..00000000000
--- a/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/migration/5-pool/none.yaml b/qa/suites/rbd/migration/5-pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/qa/suites/rbd/migration/5-pool/none.yaml
+++ /dev/null
diff --git a/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml b/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool
diff --git a/qa/suites/rbd/migration/conf b/qa/suites/rbd/migration/conf
new file mode 120000
index 00000000000..4bc0fe86c63
--- /dev/null
+++ b/qa/suites/rbd/migration/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
+\ No newline at end of file