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 35ef6e279e6f9d26a7ff648eca65096f19179934..87c69987f5e69a8a5ab9ba09a863a8cddbda21d4 100755 (executable)
--- 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: