]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: use osd ids instead of device name in ooo_collocation
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 22 Oct 2019 11:27:20 +0000 (13:27 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 23 Oct 2019 15:17:24 +0000 (17:17 +0200)
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>
(cherry picked from commit b5a61fe2e3b4a509bb80536b634543c5e7a44d07)

tests/conftest.py

index f7687f3c2bfd919cdf57dc7bffaee40d00d171ca..c56f55bb695b777a47cbc8fdeb65c1237c319aa7 100644 (file)
@@ -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]