qa: move cephfs_ec_profile under cephfs

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml b/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml
index 9bc487cfc120eed931fd7836df8fadff85441a4c..512eb117c3f1c1924ed3310858b771b69077bf5a 100644 (file)
--- a/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml
+++ b/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml
@@ -4,10 +4,11 @@ overrides:
     bdev_inject_crash_probability: .5
   ceph:
     fs: xfs
-    cephfs_ec_profile:
-      - m=2
-      - k=2
-      - crush-failure-domain=osd
+    cephfs:
+      ec_profile:
+        - m=2
+        - k=2
+        - crush-failure-domain=osd
     conf:
       osd:
         osd objectstore: bluestore

diff --git a/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml b/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml
index 726ad3d5615b8f4dd7d8948a6bd632563eeb08ef..b89c4c71125ceb43c600934a922629453956d9d6 100644 (file)
--- a/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml
+++ b/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml
@@ -4,10 +4,11 @@ overrides:
     bdev_inject_crash_probability: .5
   ceph:
     fs: xfs
-    cephfs_ec_profile:
-      - m=2
-      - k=2
-      - crush-failure-domain=osd
+    cephfs:
+      ec_profile:
+        - m=2
+        - k=2
+        - crush-failure-domain=osd
     conf:
       osd:
         osd objectstore: bluestore

diff --git a/qa/suites/fs/functional/tasks/mds-full.yaml b/qa/suites/fs/functional/tasks/mds-full.yaml
index d00dd9bbcc924b846e4feab1b9b29015e128c0d1..0c869287750c92ea08a0e5aecba7e31b9b364eb3 100644 (file)
--- a/qa/suites/fs/functional/tasks/mds-full.yaml
+++ b/qa/suites/fs/functional/tasks/mds-full.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
-    cephfs_ec_profile:
-      - disabled
+    cephfs:
+      ec_profile:
+        - disabled
     log-ignorelist:
       - OSD full dropping all updates
       - OSD near full

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 76211c69669c7b81c3798a433deb0dbdb8b687b1..fdbca0eaf4a25121cc9931aad93f797b038afa6f 100644 (file)
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -462,7 +462,7 @@ class Filesystem(MDSCluster):
         self.data_pool_name = None
         self.data_pools = None
         self.fs_config = fs_config
-        self.ec_profile = fs_config.get('cephfs_ec_profile')
+        self.ec_profile = fs_config.get('ec_profile')
 
         client_list = list(misc.all_roles_of_type(self._ctx.cluster, 'client'))
         self.client_id = client_list[0]

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 81fd59283769e00e7e9455357b475614edbe02bd..8c7cd32cf56ed52a903f03fc06c265eb02f08417 100644 (file)
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -1181,7 +1181,7 @@ class LocalFilesystem(Filesystem, LocalMDSCluster):
         self.data_pool_name = None
         self.data_pools = None
         self.fs_config = fs_config
-        self.ec_profile = fs_config.get('cephfs_ec_profile')
+        self.ec_profile = fs_config.get('ec_profile')
 
         # Hack: cheeky inspection of ceph.conf to see what MDSs exist
         self.mds_ids = set()