From f68f9dd7c389cbd7846c366cd528769f382c0217 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 29 Oct 2021 09:49:17 -0500
Subject: [PATCH] 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>
---
 src/cephadm/cephadm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 35ef6e279e6f..87c69987f5e6 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:
-- 
2.47.3