From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 4 Aug 2023 21:03:40 +0000 (-0400)
Subject: qa/keystone: merge overrides into config
X-Git-Tag: v18.2.5~53^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0274e89edbaf5910ba8558f0075c481f5e8ae5e6;p=ceph.git

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 7aa785055c21..f0f09842e605 100644
--- 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)