From: Andrew Schoen Date: Wed, 7 Dec 2016 16:32:00 +0000 (-0600) Subject: tests: add num_devices to node fixture X-Git-Tag: v2.1.0~26^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2ffd66ca828487ec3cc7cf2bcbe36c0cae86f99;p=ceph-ansible.git tests: add num_devices to node fixture Signed-off-by: Andrew Schoen --- diff --git a/tests/conftest.py b/tests/conftest.py index 87f1ac333..ef87c6cc7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -30,6 +30,7 @@ def node(Ansible, Interface, Command, request): address = Interface("eth1").addresses[0] subnet = ".".join(ansible_vars["public_network"].split(".")[0:-1]) num_mons = len(ansible_vars["groups"]["mons"]) + num_devices = len(ansible_vars["devices"]) cluster_name = ansible_vars.get("cluster", "ceph") conf_path = "/etc/ceph/{}.conf".format(cluster_name) data = dict( @@ -38,6 +39,7 @@ def node(Ansible, Interface, Command, request): vars=ansible_vars, osd_ids=osd_ids, num_mons=num_mons, + num_devices=num_devices, cluster_name=cluster_name, conf_path=conf_path, )