ceph-deploy: support overrides

Something like

overrides:
  ceph-deploy:
    foo: bar

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

diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py
index e6f8d18a88f40d1c90b5ab4a6d9ce6e7d880b2e6..da0743bb364ff2ff74c444a257593a5526ff1447 100644 (file)
--- a/teuthology/task/ceph-deploy.py
+++ b/teuthology/task/ceph-deploy.py
@@ -398,6 +398,9 @@ def task(ctx, config):
     if config is None:
         config = {}
 
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('ceph-deploy', {}))
+
     assert isinstance(config, dict), \
         "task ceph-deploy only supports a dictionary for configuration"