import quincy beta 17.1.0

[ceph.git] / ceph / qa / tasks / ceph.conf.template

diff --git a/ceph/qa/tasks/ceph.conf.template b/ceph/qa/tasks/ceph.conf.template
index 609a124b82d891753e5f7a40f4969668931e6359..a6dcf4d342f20fddb670c79323950f937feb5231 100644 (file)
--- a/ceph/qa/tasks/ceph.conf.template
+++ b/ceph/qa/tasks/ceph.conf.template
@@ -32,7 +32,7 @@
         mon_warn_on_pool_no_redundancy = false
        mon_allow_pool_size_one = true
 
-        osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd crush-failure-domain=osd"
+        osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
 
        osd default data pool replay window = 5
 
@@ -99,6 +99,11 @@
        mon_warn_on_insecure_global_id_reclaim = false
        mon_warn_on_insecure_global_id_reclaim_allowed = false
 
+       # 1m isn't quite enough
+       mon_down_mkfs_grace = 2m
+
+       mon_warn_on_filestore_osds = false
+
 [client]
        rgw cache enabled = true
        rgw enable ops log = true