aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-13 13:03:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-13 13:03:12 +0000
commit61322cab353e2553e0af2bdb35b482c33683312f (patch)
tree1190d17c0b5a148ec9e57d9ba8d9344110788973 /functest/ci
parent8eef71278d06f2fd91b99e6be19069ba077c2d29 (diff)
parenteb0151059dcc1efff797eeeb9f0e77e344426ef6 (diff)
Merge "Fix source_credentials in openstack_utils"
Diffstat (limited to 'functest/ci')
-rwxr-xr-xfunctest/ci/prepare_env.py6
-rwxr-xr-xfunctest/ci/run_tests.py4
2 files changed, 4 insertions, 6 deletions
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index b3e59020..cca9ac73 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -170,12 +170,10 @@ def source_rc_file():
sys.exit(1)
logger.info("Sourcing the OpenStack RC file...")
- creds = os_utils.source_credentials(
+ os_utils.source_credentials(
CONST.openstack_creds)
- str = ""
- for key, value in creds.iteritems():
+ for key, value in os.environ.iteritems():
if re.search("OS_", key):
- str += "\n\t\t\t\t\t\t " + key + "=" + value
if key == 'OS_AUTH_URL':
CONST.OS_AUTH_URL = value
elif key == 'OS_USERNAME':
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 320102dd..6a6516ab 100755
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -78,8 +78,8 @@ def source_rc_file():
logger.error("RC file %s does not exist..." % rc_file)
sys.exit(1)
logger.debug("Sourcing the OpenStack RC file...")
- creds = os_utils.source_credentials(rc_file)
- for key, value in creds.iteritems():
+ os_utils.source_credentials(rc_file)
+ for key, value in os.environ.iteritems():
if re.search("OS_", key):
if key == 'OS_AUTH_URL':
ft_constants.OS_AUTH_URL = value