From 245d6a5cec9cc0f299613b8cc0415e494a4c3ac5 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 10 Mar 2020 19:28:35 -0600 Subject: [PATCH] cephadm: raise Error when no config/keyring fixes mypy error: cephadm:1141: error: Incompatible return value type (got "Tuple[Optional[str], Optional[str]]", expected "Tuple[str, str]") Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index af2b3ea2419..c1c30d81db1 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1134,10 +1134,14 @@ def get_config_and_keyring(): elif args.keyring: with open(args.keyring, 'r') as f: keyring = f.read() - else: - raise Error('no keyring provided') with open(args.config, 'r') as f: config = f.read() + + if not config: + raise Error('no config provided') + elif not keyring: + raise Error('no keyring provided') + return (config, keyring) def get_container_mounts(fsid, daemon_type, daemon_id, -- 2.39.5