From 2173d33d8912c432816bd2f980870e58c208cb1b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Jul 2013 11:21:07 -0700 Subject: [PATCH] ceph-deploy: support overrides Something like overrides: ceph-deploy: foo: bar Signed-off-by: Sage Weil --- teuthology/task/ceph-deploy.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py index e6f8d18a88f..da0743bb364 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"