qa/tasks/ceph2: fix conf

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/tasks/ceph2.conf b/qa/tasks/ceph2.conf
index 530feccd05e7a0caf2089604813a62e025543087..a6cbb28c0eb0a7ffbf70fc34511942f92b8184a3 100644 (file)
--- a/qa/tasks/ceph2.conf
+++ b/qa/tasks/ceph2.conf
@@ -2,11 +2,14 @@
 # make logging friendly to teuthology
 log_to_file = true
 log_to_stderr = false
+mon cluster log file level = debug
 
 mon clock drift allowed = 1.000
 
 # replicate across OSDs, not hosts
 osd crush chooseleaf type = 0
+#osd pool default size = 2
+osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd crush-failure-domain=osd"
 
 # enable some debugging
 auth debug = true
@@ -29,15 +32,9 @@ mon_warn_on_pool_pg_num_not_power_of_two = false
 # disable pg_autoscaler by default for new pools
 osd_pool_default_pg_autoscale_mode = off
 
-#osd pool default size = 2
-
-osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd crush-failure-domain=osd"
-
- # tests delete pools
+# tests delete pools
 mon allow pool delete = true
 
-mon cluster log file level = debug
-
 [osd]
 osd scrub load threshold = 5.0
 osd scrub max interval = 600
@@ -54,8 +51,14 @@ osd debug shutdown = true
 osd debug op order = true
 osd debug verify stray on activate = true
 osd debug pg log writeout = true
-bdev debug aio = true
+osd debug verify cached snaps = true
+osd debug verify missing on start = true
 osd debug misdirected ops = true
+osd op queue = debug_random
+osd op queue cut off = debug_random
+osd shutdown pgref assert = true
+bdev debug aio = true
+osd sloppy crc = true
 
 [mgr]
 mon reweight min pgs per osd = 4

diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py
index 2c54cb31212707d2f2e3a3217cf051a7d16f2146..66ea4f1a138b63d64e1ab2d9811fc167a421b1d4 100644 (file)
--- a/qa/tasks/ceph2.py
+++ b/qa/tasks/ceph2.py
@@ -62,7 +62,7 @@ def build_initial_config(ctx, config):
     conf['global']['fsid'] = ctx.ceph[cluster_name].fsid
 
     # overrides
-    for section, keys in config['conf'].items():
+    for section, keys in config.get('conf',{}).items():
         for key, value in keys.items():
             log.info(" override: [%s] %s = %s" % (section, key, value))
             if section not in conf: