X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fidentity_auth.py;h=62b45ede7d53c7ddc31ceaa1ebd29a2c786f2884;hb=62bbcb5c9c24a1801c68ca5f2ec8a03c13b35ff1;hp=2586720c7802c48b3c60e7eb411378b6f15896a9;hpb=25759e0a0204765a7a9454d7586df66592e943c2;p=doctor.git diff --git a/doctor_tests/identity_auth.py b/doctor_tests/identity_auth.py index 2586720c..62b45ede 100644 --- 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'))