Merge PR #43734 into master

* refs/pull/43734/head:
	cephadm: --config-json overrides --config or --keyring args

Reviewed-by: Adam King <adking@redhat.com>

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: