From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 23 Dec 2020 23:44:57 +0000 (-0800)
Subject: qa: move cephfs_ec_profile under cephfs
X-Git-Tag: v16.1.0~107^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=488f10c62ffd7fcc9a5ebe417be2b1c60f4720a7;p=ceph.git

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 9bc487cfc120..512eb117c3f1 100644
--- 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 726ad3d5615b..b89c4c71125c 100644
--- 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 d00dd9bbcc92..0c869287750c 100644
--- 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 76211c69669c..fdbca0eaf4a2 100644
--- 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 81fd59283769..8c7cd32cf56e 100644
--- 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()