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 <mfritch@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index af2b3ea24195e5412cbaee16b6ca9793675d9897..c1c30d81db1a322b5765cecde4479e730897f13c 100755 (executable)
--- 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,