From f3f28f500d08510686e8e728b1ac584af08482fb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 3 Oct 2019 14:29:10 -0500 Subject: [PATCH] ceph-daemon: make ceph-volume use get_config_and_keyring This will always take the first config+keyring json branch. Signed-off-by: Sage Weil --- src/ceph-daemon | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index c2f131a5b59..59f8a46781e 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -779,15 +779,9 @@ def command_ceph_volume(): tmp_keyring = None if args.config_and_keyring: - import json - if args.config_and_keyring == '-': - j = sys.stdin.read() - else: - with open(args.config_and_keyring, 'r') as f: - j = f.read() - d = json.loads(j) - config = d.get('config') - keyring = d.get('keyring') + # note: this will always pull from args.config_and_keyring (we + # require it) and never args.config or args.keyring. + (config, keyring) = get_config_and_keyring() # tmp keyring file tmp_keyring = tempfile.NamedTemporaryFile(mode='w') -- 2.39.5