From bad788d58473ba9490ef7a41ae37e3dfcaa4a3bc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Mar 2020 07:54:34 -0500 Subject: [PATCH] cephadm: env over last used Signed-off-by: Sage Weil --- src/cephadm/cephadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 99431f1752a08..c53a27ae82c31 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -942,12 +942,12 @@ def infer_image(func): """ @wraps(func) def _infer_image(): + if not args.image: + args.image = os.environ.get('CEPHADM_IMAGE') if not args.image: args.image = get_last_local_ceph_image() if not args.image: args.image = DEFAULT_IMAGE - if not args.image: - args.image = os.environ.get('CEPHADM_IMAGE') return func() return _infer_image -- 2.39.5