Add missing character to aarch functest conf file

[functest.git] / functest / utils / env.py

diff --git a/functest/utils/env.py b/functest/utils/env.py
index 19c6099..d7b396e 100644 (file)
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,27 +1,39 @@
+#!/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()
-        self._set_ci_loop()
+        if 'CI_LOOP' not in os.environ:
+            self._set_ci_loop()
 
     def _set_ci_run(self):
         if self.BUILD_TAG: