From 565775fb0c65bb148964b77089a30c8c2500ed11 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Wed, 13 Nov 2019 10:13:01 +0100 Subject: [PATCH] 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) --- src/ceph-volume/ceph_volume/tests/functional/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5