From: Sage Weil <sage@inktank.com>
Date: Thu, 18 Jul 2013 18:21:07 +0000 (-0700)
Subject: ceph-deploy: support overrides
X-Git-Tag: 1.1.0~2076
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2173d33d8912c432816bd2f980870e58c208cb1b;p=teuthology.git

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 e6f8d18a88..da0743bb36 100644
--- 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"