]> git-server-git.apps.pok.os.sepia.ceph.com Git - cephmetrics.git/commitdiff
ceph-docker: Update tests for 'containerized' flag 180/head
authorZack Cerza <zack@redhat.com>
Thu, 10 May 2018 22:30:11 +0000 (16:30 -0600)
committerZack Cerza <zack@redhat.com>
Fri, 11 May 2018 20:59:22 +0000 (14:59 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
ansible/roles/ceph-docker/tests/test_docker.py

index 25088589aca0a24b10310653cb4cb56f79853205..d04ae7b5648f2f1c27b2763a106b9a8552185b32 100644 (file)
@@ -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):