]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #39007 from mgfritch/cephadm-podman-2.0
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 29 Jan 2021 09:26:03 +0000 (10:26 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Jan 2021 09:26:03 +0000 (10:26 +0100)
 cephadm: require podman >= 2.0.0

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
ceph.spec.in
src/cephadm/cephadm

diff --cc ceph.spec.in
Simple merge
index 3125a910d35f3f6a49d7bbde6300329c0075d51e,91f1c0aa9f255f6ef52976662f8e7a98c956bbf0..a04f8eb5ae66d91eec058d85fb9293096b0a6bce
@@@ -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'