readwrite: fix task with default conf

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index a009d5cb735032bb7013ee8ec55aa94af47b1d61..14a8977f73fdc21b0c20d86f9b760de012cae73d 100644 (file)
--- a/teuthology/task/s3readwrite.py
+++ b/teuthology/task/s3readwrite.py
@@ -221,7 +221,11 @@ def task(ctx, config):
 
     s3tests_conf = {}
     for client in clients:
-        print 'client={client} config[client]={conf}'.format(client=client, conf=config[client])
+        if config[client] is None:
+            config[client] = {}
+        config[client].setdefault('s3', {})
+        config[client].setdefault('readwrite', {})
+
         s3tests_conf[client] = ({
                 'DEFAULT':
                     {
@@ -231,7 +235,6 @@ def task(ctx, config):
                 'readwrite' : config[client]['readwrite'],
                 's3'  : config[client]['s3'],
                 })
-        print 's3tests_conf[client]={s}'.format(s=s3tests_conf[client])
 
     with contextutil.nested(
         lambda: download(ctx=ctx, config=clients),