bugfix: certificate for https for MCP in baremetal

[doctor.git] / doctor_tests / identity_auth.py

diff --git a/doctor_tests/identity_auth.py b/doctor_tests/identity_auth.py
index 2586720..62b45ed 100644 (file)
--- a/doctor_tests/identity_auth.py
+++ b/doctor_tests/identity_auth.py
@@ -16,11 +16,11 @@ def get_identity_auth(username=None, password=None, project=None):
     auth_url = os.environ['OS_AUTH_URL']
     username = username or os.environ['OS_USERNAME']
     password = password or os.environ['OS_PASSWORD']
-    user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'default'
+    user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'Default'
     user_domain_id = os.environ.get('OS_USER_DOMAIN_ID') or 'default'
-    project_name = project or os.environ.get('OS_PROJECT_NAME') \
-                   or os.environ.get('OS_TENANT_NAME')
-    project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'default'
+    project_name = (project or os.environ.get('OS_PROJECT_NAME') or
+                    os.environ.get('OS_TENANT_NAME'))
+    project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'Default'
     project_domain_id = os.environ.get('OS_PROJECT_DOMAIN_ID') or 'default'
 
     loader = loading.get_plugin_loader('password')
@@ -40,4 +40,5 @@ def get_session(auth=None):
     """Get a user credentials auth session."""
     if auth is None:
         auth = get_identity_auth()
-    return session.Session(auth=auth)
+    return session.Session(auth=auth,
+                           verify=os.environ.get('OS_CACERT'))