X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=baro_tests%2Fconfig_server.py;fp=baro_tests%2Fconfig_server.py;h=8b597cc5e9834968474f3c10cf336ec06071bd81;hb=f5894ba7d8dae3928694419f74023fcba36a9dbd;hp=a5c8c7011d72c2686f78228e04dd03681b7c028e;hpb=47b77018cde65b57a65faa1398e96918430415fb;p=barometer.git

diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index a5c8c701..8b597cc5 100644
--- a/baro_tests/config_server.py
+++ b/baro_tests/config_server.py
@@ -269,8 +269,13 @@ class ConfigServer(object):
                 stdout = node.run_cmd(
                     "source overcloudrc.v3;"
                     + "openstack catalog list | grep gnocchi")
-                if 'gnocchi' in stdout:
+                if stdout is None:
+                    return False
+                elif 'gnocchi' in stdout:
                     gnocchi_present = True
+                    return gnocchi_present
+                else:
+                    return False
         return gnocchi_present
 
     def is_aodh_running(self, controller):
@@ -287,8 +292,13 @@ class ConfigServer(object):
                 stdout = node.run_cmd(
                     "source overcloudrc.v3;"
                     + "openstack catalog list | grep aodh")
-                if 'aodh' in stdout:
+                if stdout is None:
+                    return False
+                elif 'aodh' in stdout:
                     aodh_present = True
+                    return aodh_present
+                else:
+                    return False
         return aodh_present
 
     def is_mcelog_installed(self, compute, package):