From: Teoman ONAY <tonay@ibm.com>
Date: Wed, 13 Mar 2024 16:23:00 +0000 (+0100)
Subject: cephadm: bootstrap fails if no container engine installed
X-Git-Tag: testing/wip-root-testing-20240411.174241~60^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4bbda54967e2667f368dc9e883ce5490c7e60102;p=ceph-ci.git

cephadm: bootstrap fails if no container engine installed

When boostrapping a new cluster, if no container engine is present,
the process stops asking to install one. One of the bootstrap steps,
is to run command_prepare_host which takes care of installing the
missing dependencies but it didn't reach this step.

Fixes: https://tracker.ceph.com/issues/64899

Signed-off-by: Teoman ONAY <tonay@ibm.com>
(cherry picked from commit bb51d78efa68a3c5460d520e93b1da6e4c543253)
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 5a7ed9e7665..2846385d9c0 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -4465,6 +4465,7 @@ def command_prepare_host(ctx: CephadmContext) -> None:
         if not pkg:
             pkg = create_packager(ctx)
         pkg.install_podman()
+        ctx.container_engine = find_container_engine(ctx)
 
     logger.info('Verifying lvm2 is present...')
     if not find_executable('lvcreate'):
@@ -5501,7 +5502,8 @@ def main() -> None:
                     command_prepare_host,
                     command_add_repo,
                     command_rm_repo,
-                    command_install
+                    command_install,
+                    command_bootstrap
                 ]:
             check_container_engine(ctx)
         # command handler