From: Sage Weil <sage@redhat.com>
Date: Sun, 15 Mar 2020 15:18:04 +0000 (-0500)
Subject: cephadm: do not infer image for bootstrap
X-Git-Tag: v15.2.0~43^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15a893811afcc61e82f9f26a57177f825178a812;p=ceph.git

cephadm: do not infer image for bootstrap

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 93830d0beaba..f89daff60fa1 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4081,11 +4081,13 @@ if __name__ == "__main__":
             sys.stderr.write('Unable to locate any of %s\n' % CONTAINER_PREFERENCE)
             sys.exit(1)
 
-    inferred_image = _infer_image()
-
     if 'func' not in args:
         sys.stderr.write('No command specified; pass -h or --help for usage\n')
         sys.exit(1)
+
+    if args.func != command_bootstrap:
+        inferred_image = _infer_image()
+
     try:
         r = args.func()
     except Error as e: