From: Michael Fritch Date: Mon, 25 Jan 2021 23:08:41 +0000 (-0700) Subject: cephadm: require podman >= 2.0.2 X-Git-Tag: v16.2.0~230^2~48 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37968776314363f379a0c71bbfadfec71dc09d4d;p=ceph.git cephadm: require podman >= 2.0.2 Fixes: https://tracker.ceph.com/issues/47139 Signed-off-by: Michael Fritch (cherry picked from commit 8b7047b6144084107e516cd9dadeeb29ebdbfead) --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 34cc8605abe3..cbbec8608783 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -11,6 +11,7 @@ UNIT_DIR = '/etc/systemd/system' LOG_DIR_MODE = 0o770 DATA_DIR_MODE = 0o700 CONTAINER_PREFERENCE = ['podman', 'docker'] # prefer podman to docker +MIN_PODMAN_VERSION = (2, 0, 2) CUSTOM_PS1 = r'[ceph: \u@\h \W]\$ ' DEFAULT_TIMEOUT = None # in seconds DEFAULT_RETRY = 10 @@ -1874,6 +1875,9 @@ def check_container_engine(ctx): engine = os.path.basename(ctx.container_path) if ctx.container_path else None if engine not in CONTAINER_PREFERENCE: raise Error('Unable to locate any of %s' % CONTAINER_PREFERENCE) + elif engine == 'podman': + if get_podman_version(ctx, ctx.container_path) < MIN_PODMAN_VERSION: + raise Error('podman version %d.%d.%d or later is required' % MIN_PODMAN_VERSION) def get_unit_name(fsid, daemon_type, daemon_id=None):