From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Feb 2020 19:20:44 +0000 (-0600)
Subject: cephadm: prepare-host: do not create Packager unless we need it
X-Git-Tag: v15.1.1~338^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33443%2Fhead;p=ceph.git

cephadm: prepare-host: do not create Packager unless we need it

Otherwise, bootstrap may fail on an unrecognized/unsupported distro even
though all the dependencies are present.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 36a35a7f40a8..56dd09dc7cc7 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2624,17 +2624,23 @@ def command_check_host():
 ##################################
 
 def command_prepare_host():
-    pkg = create_packager()
     logger.info('Verifying podman|docker is present...')
+    pkg = None
     if not container_path:
+        if not pkg:
+            pkg = create_packager()
         pkg.install_podman()
 
     logger.info('Verifying lvm2 is present...')
     if not find_executable('lvcreate'):
+        if not pkg:
+            pkg = create_packager()
         pkg.install(['lvm2'])
 
     logger.info('Verifying time synchronization is in place...')
     if not check_time_sync():
+        if not pkg:
+            pkg = create_packager()
         pkg.install(['chrony'])
 
     if 'expect_hostname' in args and args.expect_hostname and args.expect_hostname != get_hostname():