From: Jan Fajerski Date: Wed, 13 Nov 2019 09:13:01 +0000 (+0100) Subject: ceph-volume: assume msgrV1 for all branches containing mimic X-Git-Tag: v12.2.13~2^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=565775fb0c65bb148964b77089a30c8c2500ed11;p=ceph.git ceph-volume: assume msgrV1 for all branches containing mimic With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume that if mimic (or luminous) occur in the branch name, the OSDs are running msgrv1 only. Fixes: https://tracker.ceph.com/issues/42791 Signed-off-by: Jan Fajerski (cherry picked from commit b8754919df61b118200e210e0bfc8d6df0261dfd) --- diff --git a/src/ceph-volume/ceph_volume/tests/functional/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/functional/tests/conftest.py index 05c9aa521bc1b..17cc996edb9f3 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/functional/tests/conftest.py @@ -19,7 +19,7 @@ def node(host, request): ceph_dev_branch = os.environ.get("CEPH_DEV_BRANCH", "master") group_names = ansible_vars["group_names"] num_osd_ports = 4 - if ceph_dev_branch in ['luminous', 'mimic']: + if 'mimic' in ceph_dev_branch or 'luminous' in ceph_dev_branch: num_osd_ports = 2 # capture the initial/default state