From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 16 Sep 2023 00:50:15 +0000 (-0400)
Subject: qa: move some configs to cluster-conf
X-Git-Tag: v20.0.0~1793^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5601f91bf97e9510b349f4dfadef5dbdf897bdb2;p=ceph.git

qa: move some configs to cluster-conf

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

diff --git a/qa/cephfs/overrides/frag.yaml b/qa/cephfs/overrides/frag.yaml
index f05b3f48fe02..d614605508c6 100644
--- a/qa/cephfs/overrides/frag.yaml
+++ b/qa/cephfs/overrides/frag.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       mds:
         mds bal fragment size max: 10000
         mds bal merge size: 5
diff --git a/qa/cephfs/overrides/prefetch_entire_dirfrags/no.yaml b/qa/cephfs/overrides/prefetch_entire_dirfrags/no.yaml
index 71d6d73bac29..419851ad5626 100644
--- a/qa/cephfs/overrides/prefetch_entire_dirfrags/no.yaml
+++ b/qa/cephfs/overrides/prefetch_entire_dirfrags/no.yaml
@@ -1,5 +1,5 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       mds:
         mds_dir_prefetch: false
diff --git a/qa/cephfs/overrides/prefetch_entire_dirfrags/yes.yaml b/qa/cephfs/overrides/prefetch_entire_dirfrags/yes.yaml
index 5d25b61d181d..1a90cfb55cdf 100644
--- a/qa/cephfs/overrides/prefetch_entire_dirfrags/yes.yaml
+++ b/qa/cephfs/overrides/prefetch_entire_dirfrags/yes.yaml
@@ -1,5 +1,5 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       mds:
         mds_dir_prefetch: true
diff --git a/qa/suites/fs/libcephfs/tasks/ino_release_cb.yaml b/qa/suites/fs/libcephfs/tasks/ino_release_cb.yaml
index 5b524748975c..45644c944c0e 100644
--- a/qa/suites/fs/libcephfs/tasks/ino_release_cb.yaml
+++ b/qa/suites/fs/libcephfs/tasks/ino_release_cb.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       client:
         debug ms: 1
         debug client: 20
diff --git a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml
index 29ed93bb3e8b..dee81778942e 100644
--- a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml
+++ b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml
@@ -5,9 +5,14 @@ mgrmodules:
           - ceph mgr module enable snap_schedule
 overrides:
   ceph:
-    conf:
+    mgr-modules:
+      - snap_schedule
+    cluster-conf:
       mgr:
         debug cephsqlite: 20
+        mgr/snap_schedule/log_level: debug
+        mgr/snap_schedule/allow_m_granularity: true
+        mgr/snap_schedule/dump_on_update: true
   check-counter:
     counters:
       mds:
@@ -17,9 +22,6 @@ overrides:
 tasks:
 - exec:
     mon.a:
-      - ceph config set mgr mgr/snap_schedule/log_level debug
-      - ceph config set mgr mgr/snap_schedule/allow_m_granularity true
-      - ceph config set mgr mgr/snap_schedule/dump_on_update true
       - ceph fs snap-schedule add --fs=cephfs --path=/ --snap_schedule=1m
       - ceph fs snap-schedule retention add --fs=cephfs --path=/ --retention-spec-or-period=6m3h
       - ceph fs snap-schedule status --fs=cephfs --path=/