From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 22 Oct 2019 11:27:20 +0000 (+0200)
Subject: tests: use osd ids instead of device name in ooo_collocation
X-Git-Tag: v5.0.0alpha1~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5a61fe2e3b4a509bb80536b634543c5e7a44d07;p=ceph-ansible.git

tests: use osd ids instead of device name in ooo_collocation

on master, it doesn't make sense anymore to use device name, we should
use osd id instead.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/tests/conftest.py b/tests/conftest.py
index 47b10c2ee..032e704a0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -60,12 +60,6 @@ def setup(host):
         if cmd.rc == 0:
             osd_ids = cmd.stdout.rstrip("\n").split("\n")
             osds = osd_ids
-            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)
-                    real_dev_split = real_dev.stdout.split("/")[-1]
-                    osds.append(real_dev_split)
 
     address = host.interface(public_interface).addresses[0]