openstack/python-senlinclient
Code Issues Proposed changes

Make v3 the default backend for authentication

Browse Source 
Don't export OS_DOMAIN_NAME if we want a project scope authentication.
This commit is contained in:
tengqm 2015-01-20 17:18:33 +08:00
parent a2e70e4364
commit ff3bef0324
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
senlinrc
View File

@ -11,7 +11,7 @@ unset OS_USER_DOMAIN_NAME
unset OS_TENANT_NAME unset OS_TENANT_NAME
unset OS_AUTH_URL unset OS_AUTH_URL
VERSION=${IDENTITY_API_VERSION:-2.0} VERSION=${IDENTITY_API_VERSION:-3}
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
OS_USERNAME=$1 OS_USERNAME=$1
@ -33,8 +33,8 @@ HOST=${HOST:-$SERVICE_HOST}
export OS_AUTH_URL=$PROTOCOL://$HOST:5000/v${VERSION} export OS_AUTH_URL=$PROTOCOL://$HOST:5000/v${VERSION}
if [[ $VERSION == 3 ]]; then if [[ $VERSION == 3 ]]; then
export OS_PROJECT_NAME export OS_PROJECT_NAME=${OS_PROJECT_NAME}
export OS_DOMAIN_NAME=${OS_DOMAIN_NAME:-default} # export OS_DOMAIN_NAME=${OS_DOMAIN_NAME:-default}
export OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default} export OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default}
export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-default} export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-default}
else else