From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 29 Jan 2021 09:26:03 +0000 (+0100)
Subject: Merge pull request #39007 from mgfritch/cephadm-podman-2.0
X-Git-Tag: v17.1.0~3131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46188c4caa57f8b4177404e17dc3a6b224d581d9;p=ceph.git

Merge pull request #39007 from mgfritch/cephadm-podman-2.0

 cephadm: require podman >= 2.0.0

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

46188c4caa57f8b4177404e17dc3a6b224d581d9
diff --cc src/cephadm/cephadm
index 3125a910d35f,91f1c0aa9f25..a04f8eb5ae66
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -11,9 -11,10 +11,10 @@@ 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
 +DEFAULT_RETRY = 15
  SHELL_DEFAULT_CONF = '/etc/ceph/ceph.conf'
  SHELL_DEFAULT_KEYRING = '/etc/ceph/ceph.client.admin.keyring'