cephadm: env over last used

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 99431f1752a08417676cb214257703cfd2aa429b..c53a27ae82c31342c3ca95b5f08ae6ab123bffbd 100755 (executable)
--- 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