From e9fc46166dbd0e1cb6eed7d721f9f2df5bebe4f0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Feb 2020 13:20:44 -0600 Subject: [PATCH] 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 --- src/cephadm/cephadm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 36a35a7f40a8d..56dd09dc7cc74 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(): -- 2.39.5