From 4ea11ca811765c89326c88ab644e80d48ce733d9 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 10 Mar 2020 19:28:52 -0600 Subject: [PATCH] cephadm: prefer config/keyring args let `--config` or `--keyring` take precedence over the values supplied via the `--config-json` Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index c1c30d81db1a3..55eaf334ff6c9 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1128,15 +1128,17 @@ def get_config_and_keyring(): d = get_parm(args.config_json) config = d.get('config') keyring = d.get('keyring') - else: - if args.key: - keyring = '[%s]\n\tkey = %s\n' % (args.name, args.key) - elif args.keyring: - with open(args.keyring, 'r') as f: - keyring = f.read() + + if 'config' in args and args.config: with open(args.config, 'r') as f: config = f.read() + if 'key' in args and args.key: + keyring = '[%s]\n\tkey = %s\n' % (args.name, args.key) + elif 'keyring' in args and args.keyring: + with open(args.keyring, 'r') as f: + keyring = f.read() + if not config: raise Error('no config provided') elif not keyring: -- 2.39.5