qa/keystone: merge overrides into config

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f19d05dcab8093424d9cd50943972fa7f1942f92)

diff --git a/qa/tasks/keystone.py b/qa/tasks/keystone.py
index 7aa785055c21bb6c0de89064f1080314125a6edf..f0f09842e60505a938f8841cfce66d96f038d903 100644 (file)
--- a/qa/tasks/keystone.py
+++ b/qa/tasks/keystone.py
@@ -463,6 +463,8 @@ def task(ctx, config):
         config = all_clients
     if isinstance(config, list):
         config = dict.fromkeys(config)
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('keystone', {}))
 
     log.debug('Keystone config is %s', config)