From: Sage Weil <sage@newdream.net>
Date: Fri, 29 Oct 2021 14:49:17 +0000 (-0500)
Subject: cephadm: --config-json overrides --config or --keyring args
X-Git-Tag: v17.1.0~556^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f68f9dd7c389cbd7846c366cd528769f382c0217;p=ceph-ci.git

cephadm: --config-json overrides --config or --keyring args

These args aren't normally combined, but if --fsid and --name are
provided, they may be inferred.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 35ef6e279e6..87c69987f5e 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2336,6 +2336,8 @@ def get_config_and_keyring(ctx):
         d = get_parm(ctx.config_json)
         config = d.get('config')
         keyring = d.get('keyring')
+        if config and keyring:
+            return config, keyring
 
     if 'config' in ctx and ctx.config:
         try: