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>
(cherry picked from commit f68f9dd7c389cbd7846c366cd528769f382c0217)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 49417c4a0da57f6c9d4e209bc97e0958472ac7c1..a41f70f7ef61b5262605dc6050b4e1216f85e642 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2315,6 +2315,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: