From 9f310ec200629deaec8ff8f4e1b85974cd5b8095 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 13 May 2021 17:03:32 -0600 Subject: [PATCH] cephadm: clean-up error message use the standard error message from FileNotFound: ``` cephadm bootstrap --mon-ip 192.168.1.1 --config ~/foobar ERROR: [Errno 2] No such file or directory: '/root/foobar' ``` Signed-off-by: Michael Fritch (cherry picked from commit 870e9bddd2a059ae4930a2eed163bb862094dcaa) --- src/cephadm/cephadm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 1b0fe9b069a25..1c23a7ce6378b 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2259,8 +2259,8 @@ def get_config_and_keyring(ctx): try: with open(ctx.config, 'r') as f: config = f.read() - except FileNotFoundError: - raise Error('config file: %s does not exist' % ctx.config) + except FileNotFoundError as e: + raise Error(e) if 'key' in ctx and ctx.key: keyring = '[%s]\n\tkey = %s\n' % (ctx.name, ctx.key) @@ -2268,8 +2268,8 @@ def get_config_and_keyring(ctx): try: with open(ctx.keyring, 'r') as f: keyring = f.read() - except FileNotFoundError: - raise Error('keyring file: %s does not exist' % ctx.keyring) + except FileNotFoundError as e: + raise Error(e) return config, keyring -- 2.39.5