From bd0fa0c46c716b4b696a05e4d1202ab6528500e4 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 10 Mar 2020 19:28:30 -0600 Subject: [PATCH] cephadm: consolidate logic for reading `config-json` logic for reading `--config-json` from stdin or file was duplicated Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 396f7b3dffebf..af2b3ea24195e 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1125,15 +1125,7 @@ def get_parm(option): def get_config_and_keyring(): # type: () -> Tuple[str, str] if 'config_json' in args and args.config_json: - if args.config_json == '-': - try: - j = injected_stdin # type: ignore - except NameError: - j = sys.stdin.read() - else: - with open(args.config_json, 'r') as f: - j = f.read() - d = json.loads(j) + d = get_parm(args.config_json) config = d.get('config') keyring = d.get('keyring') else: -- 2.39.5