From: Zack Cerza Date: Thu, 10 May 2018 22:30:11 +0000 (-0600) Subject: ceph-docker: Update tests for 'containerized' flag X-Git-Tag: v2.0~31^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F180%2Fhead;p=cephmetrics.git ceph-docker: Update tests for 'containerized' flag Signed-off-by: Zack Cerza --- diff --git a/ansible/roles/ceph-docker/tests/test_docker.py b/ansible/roles/ceph-docker/tests/test_docker.py index 2508858..d04ae7b 100644 --- a/ansible/roles/ceph-docker/tests/test_docker.py +++ b/ansible/roles/ceph-docker/tests/test_docker.py @@ -5,12 +5,8 @@ testinfra_hosts = ['ceph-grafana'] class TestDocker(object): def maybe_skip(self, host): - services = ['grafana', 'prometheus'] - - def is_containerized(service): - vars = host.ansible.get_variables() - return vars.get(service, dict()).get('containerized') - if not any(map(is_containerized, services)): + vars = host.ansible.get_variables() + if vars.get('containerized', False) is False: pytest.skip() def test_docker_running(self, host):