qa: move cephfs_ec_profile under cephfs

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

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:
+    cephfs:
-      - m=2
+      ec_profile:
-      - k=2
+        - m=2
-      - crush-failure-domain=osd
+        - k=2
+        - crush-failure-domain=osd
     conf:
       osd:
         osd objectstore: bluestore

qa/cephfs/objectstore-ec/bluestore-ec-root.yaml

@@ -4,10 +4,11 @@ overrides:
     bdev_inject_crash_probability: .5
   ceph:
     fs: xfs
-    cephfs_ec_profile:
+    cephfs:
-      - m=2
+      ec_profile:
-      - k=2
+        - m=2
-      - crush-failure-domain=osd
+        - k=2
+        - crush-failure-domain=osd
     conf:
       osd:
         osd objectstore: bluestore

qa/suites/fs/functional/tasks/mds-full.yaml

@@ -1,7 +1,8 @@
 overrides:
   ceph:
-    cephfs_ec_profile:
+    cephfs:
-      - disabled
+      ec_profile:
+        - disabled
     log-ignorelist:
       - OSD full dropping all updates
       - OSD near full

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]

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()