]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fall back to default for infer_image
authorSage Weil <sage@redhat.com>
Wed, 18 Mar 2020 22:41:36 +0000 (17:41 -0500)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 00:10:20 +0000 (19:10 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index 280e2dc79282f9f0cc3d97d93cb0f694e350d94b..99431f1752a08417676cb214257703cfd2aa429b 100755 (executable)
@@ -944,6 +944,10 @@ def infer_image(func):
     def _infer_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