Allow Overrides for ceph-deploy task

This is needed so we can set the ceph branch for ceph-deploy
to use via the main yaml which is created via the suite
scheduler.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>

diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py
index ce36f9f50247e78b285c618c81cab9105356fd4c..9d45892a6be91897ce9bc5a29c69854aa128b18d 100644 (file)
--- a/teuthology/task/ceph-deploy.py
+++ b/teuthology/task/ceph-deploy.py
@@ -357,6 +357,9 @@ def task(ctx, config):
     assert isinstance(config, dict), \
         "task ceph-deploy only supports a dictionary for configuration"
 
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('ceph-deploy', {}))
+
     if config.get('branch') is not None:
         assert isinstance(config['branch'], dict), 'branch must be a dictionary'