X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fenv.py;h=2fb766d3275954ce4cff7dc4b597fc4fc5b62d44;hb=161d40585a25291da548dfdade2838974e86ad58;hp=19c6099cd76b6969e28ac8b74aad201e52ccd3a4;hpb=a59fea1046d167b4609c9b86836d178e799dc688;p=functest.git

diff --git a/functest/utils/env.py b/functest/utils/env.py
index 19c6099cd..2fb766d32 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,23 +1,34 @@
+#!/usr/bin/env python
+
+import pkg_resources
 import os
 import re
 
+import six
+
+
 default_envs = {
     'NODE_NAME': 'unknown_pod',
-    'CI_DEBUG': 'true',
+    'CI_DEBUG': 'false',
     'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
     'DEPLOY_TYPE': 'virt',
     'INSTALLER_TYPE': None,
     'INSTALLER_IP': None,
-    'BUILD_TAG': None
+    'BUILD_TAG': None,
+    'OS_ENDPOINT_TYPE': None,
+    'OS_AUTH_URL': None,
+    'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
+        'functest', 'ci/config_functest.yaml'),
+    'OS_INSECURE': ''
 }
 
 
 class Environment(object):
 
     def __init__(self):
-        for k, v in os.environ.iteritems():
+        for k, v in six.iteritems(os.environ):
             self.__setattr__(k, v)
-        for k, v in default_envs.iteritems():
+        for k, v in six.iteritems(default_envs):
             if k not in os.environ:
                 self.__setattr__(k, v)
         self._set_ci_run()