commit 2844bf9729a409dc96a14e8a9757117c6251e446
author Jenkins <jenkins@review.openstack.org> Fri Oct 03 06:06:46 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Oct 03 06:06:46 2014 +0000
tree 31a426cfda51bda933ae0b1543aec5bba42a385c
parent 699809c1d305d0c75abf1612df78f061338cfb80
parent 5440a40d45c59929f70b1dbab1633d2d7071af21

Merge "Don't parse config file if it doesn't exist"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index cea9dec..174a895 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1141,8 +1141,10 @@
         # to remove an issue with the config file up to date checker.
         if parse_conf:
             config_files.append(path)
-
-        cfg.CONF([], project='tempest', default_config_files=config_files)
+        if os.path.isfile(path):
+            cfg.CONF([], project='tempest', default_config_files=config_files)
+        else:
+            cfg.CONF([], project='tempest')
         logging.setup('tempest')
         LOG = logging.getLogger('tempest')
         LOG.info("Using tempest config file %s" % path)