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 f05b3f48fe0268ac5c6355aeb7acc466ce647977..d614605508c6b8de72e3f88e60d4cfaaf4d02311 100644 (file)
--- 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 71d6d73bac29aa6f1f3722f83e3303f26ef83b31..419851ad562695834dd30029029101ef44f6e87b 100644 (file)
--- 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 5d25b61d181d0aa50703eda88cbd7b92be0085a5..1a90cfb55cdf5fd065bd73a7bf7ae38e0877d429 100644 (file)
--- 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 5b524748975c185057b1ade70a11f6e2cac27068..45644c944c0eaf5a4b58019538aebd57fd4a0539 100644 (file)
--- 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 29ed93bb3e8b1cd32a5df59e8a7c64b3952633d0..dee81778942e258b5772cd1c69301f38d866d5b9 100644 (file)
--- 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=/