]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: do not infer image for bootstrap
authorSage Weil <sage@redhat.com>
Sun, 15 Mar 2020 15:18:04 +0000 (10:18 -0500)
committerSage Weil <sage@redhat.com>
Sun, 15 Mar 2020 15:19:22 +0000 (10:19 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index 93830d0beabafb76a1f441c4e1a43d56a66ad98f..f89daff60fa1f9a24fcf0f94e5f26d438a624bda 100755 (executable)
@@ -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: