ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_osd: dynamically get the osd container 

Do not enforce the container name since this will fail when we have
multiple VMs running OSDs.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/3186/head
Sébastien Han 2018-10-29 12:00:40 +01:00 committed by Guillaume Abrioux
parent 876f6ced74
commit 1cdec4069a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/functional/tests/osd/test_osds.py
View File

@ -71,14 +71,9 @@ class TestOSDs(object):
@pytest.mark.docker @pytest.mark.docker
def test_all_docker_osds_are_up_and_in(self, node, host): def test_all_docker_osds_are_up_and_in(self, node, host):
osd_scenario = node["vars"].get('osd_scenario', False) osd_id = host.check_output(
if osd_scenario in ['lvm', 'lvm-batch']: "docker ps -q --filter='name=ceph-osd' | head -1")
osd_id = "0" cmd = "sudo docker exec {osd_id} ceph --cluster={cluster} --connect-timeout 5 --keyring /var/lib/ceph/bootstrap-osd/{cluster}.keyring -n client.bootstrap-osd osd tree -f json".format(
else:
hostname = node["vars"]["inventory_hostname"]
osd_id = os.path.join(hostname+"-sda")
cmd = "sudo docker exec ceph-osd-{osd_id} ceph --cluster={cluster} --connect-timeout 5 --keyring /var/lib/ceph/bootstrap-osd/{cluster}.keyring -n client.bootstrap-osd osd tree -f json".format(
osd_id=osd_id, osd_id=osd_id,
cluster=node["cluster_name"] cluster=node["cluster_name"]
) )