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 4b37d03b45a463574f36545c09e6f3b1519488e8..fe667224f92ab6e3e8d9526b1e2305a51da0009d 100644 (file)
--- 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 b1c7a58694449cca6eb08582bc7a1b6e756e7267..ce89488d482e4d455bed4c73564941bce17425b0 100644 (file)
--- 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 e1ea6f6cc831e0f939bd89724a4ebcd104d7c95f..e33437ae4040edb0b9c81562253ff3f39b2bc5d6 100644 (file)
--- 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 1087202f99873b645a7a62bcf8a946cc0a4254e1..2687192680f88411d1ec868c49cad45ebd56dc54 100644 (file)
--- 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