From eb0151059dcc1efff797eeeb9f0e77e344426ef6 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 8 Feb 2017 17:48:47 +0100 Subject: Fix source_credentials in openstack_utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It fixes issues raised when an env var contains '=' (e.g. LS_COLORS). It now exports the vars listed in rc_file without creating a new process. Change-Id: I6e6a4e3ab9c45afe4d40015831acb283acbe564c Signed-off-by: Cédric Ollivier --- functest/ci/prepare_env.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'functest/ci/prepare_env.py') 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': -- cgit 1.2.3-korg