Merge "Restore Kingbird functest"

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

diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index a0d78ae..3093cb5 100755 (executable)
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -115,8 +115,11 @@ def source_credentials(rc_file):
     with open(rc_file, "r") as f:
         for line in f:
             var = line.rstrip('"\n').replace('export ', '').split("=")
-            key = re.sub(r'^ *| *$', '', var[0])
-            value = re.sub(r'^[" ]*|[ "]*$', '', "".join(var[1:]))
+            # The two next lines should be modified as soon as rc_file
+            # conforms with common rules. Be aware that it could induce
+            # issues if value starts with '
+            key = re.sub(r'^["\' ]*|[ \'"]*$', '', var[0])
+            value = re.sub(r'^["\' ]*|[ \'"]*$', '', "".join(var[1:]))
             os.environ[key] = value