From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 8 Aug 2023 01:14:03 +0000 (-0400)
Subject: qa/cephfs: set confs using cluster-conf
X-Git-Tag: v20.0.0~1793^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7e49c8f8e0cf8d59ed0fa8a0f15120a3633e8c6;p=ceph.git

qa/cephfs: set confs using cluster-conf

So that these configs can be easily overriden by tests.

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

diff --git a/qa/cephfs/conf/client.yaml b/qa/cephfs/conf/client.yaml
index 4b37d03b45a4..fe667224f92a 100644
--- a/qa/cephfs/conf/client.yaml
+++ b/qa/cephfs/conf/client.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       client:
         client mount timeout: 600
         debug ms: 1
diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
index b1c7a5869444..ce89488d482e 100644
--- a/qa/cephfs/conf/mds.yaml
+++ b/qa/cephfs/conf/mds.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       mds:
         debug mds: 20
         debug mds balancer: 20
diff --git a/qa/cephfs/conf/mon.yaml b/qa/cephfs/conf/mon.yaml
index e1ea6f6cc831..e33437ae4040 100644
--- a/qa/cephfs/conf/mon.yaml
+++ b/qa/cephfs/conf/mon.yaml
@@ -1,8 +1,11 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       mon:
         mon op complaint time: 120
-        # cephadm can take up to 5 minutes to bring up remaining mons
-        mon down mkfs grace: 300
         mon warn on pool no app: false
+    # cephadm can take up to 5 minutes to bring up remaining mons
+    # This needs to be set before cluster-conf configs are applied.
+    conf:
+      mon:
+        mon down mkfs grace: 300
diff --git a/qa/cephfs/conf/osd.yaml b/qa/cephfs/conf/osd.yaml
index 1087202f9987..2687192680f8 100644
--- a/qa/cephfs/conf/osd.yaml
+++ b/qa/cephfs/conf/osd.yaml
@@ -1,5 +1,5 @@
 overrides:
   ceph:
-    conf:
+    cluster-conf:
       osd:
         osd op complaint time: 180