From 22aed97266f990622d6d55fba878a50fa3a81576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 29 Oct 2018 16:24:45 +0100 Subject: [PATCH] testinfra: change test osds for containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do not use @ anymore so we don't need to perform the readlink check anymore. Also we are making an exception for ooo which is still using ceph-disk. Signed-off-by: Sébastien Han --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 03d329321..f517961fb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,6 +21,7 @@ def node(host, request): rolling_update = os.environ.get("ROLLING_UPDATE", "False") group_names = ansible_vars["group_names"] docker = ansible_vars.get("docker") + fsid = ansible_vars.get("fsid") osd_auto_discovery = ansible_vars.get("osd_auto_discovery") osd_scenario = ansible_vars.get("osd_scenario") lvm_scenario = osd_scenario in ['lvm', 'lvm-batch'] @@ -92,7 +93,7 @@ def node(host, request): if cmd.rc == 0: osd_ids = cmd.stdout.rstrip("\n").split("\n") osds = osd_ids - if docker: + if docker and fsid == "6e008d48-1661-11e8-8546-008c3214218a": osds = [] for device in ansible_vars.get("devices", []): real_dev = host.run("sudo readlink -f %s" % device)