rgw: allow overriding options

This is mainly useful for toggling ec/replicated pools right now.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 879ba8368d927206681864104580441eede8da07..674683a636a54cd03cbea41768647c42a5c38cd5 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -685,6 +685,9 @@ def task(ctx, config):
     elif isinstance(config, list):
         config = dict((name, None) for name in config)
 
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('rgw', {}))
+
     regions = {}
     if 'regions' in config:
         # separate region info so only clients are keys in config