From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 12:54:34 +0000 (-0500)
Subject: cephadm: env over last used
X-Git-Tag: v15.2.0~17^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bad788d58473ba9490ef7a41ae37e3dfcaa4a3bc;p=ceph.git

cephadm: env over last used

Signed-off-by: Sage Weil <sage@redhat.com>
---

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