Added keystone V3 support

This commit is contained in:
tengqm 2015-01-19 16:08:14 +08:00
parent e1139f262f
commit 4472a927eb

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
export VERSION=${IDENTITY_API_VERSION:-2.0}
if [[ -n "$1" ]]; then
OS_USERNAME=$1
fi
@ -15,8 +17,12 @@ export OS_REGION_NAME=${REGION_NAME:-RegionOne}
HOST_IP=${HOST_IP:-127.0.0.1}
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-$SERVICE_PROTOCOL}
KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
PROTOCOL=${PROTOCOL:-$SERVICE_PROTOCOL}
HOST=${HOST:-$SERVICE_HOST}
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
export OS_AUTH_URL=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:5000/v${OS_IDENTITY_API_VERSION}
export OS_AUTH_URL=$PROTOCOL://$HOST:5000/v${VERSION}
if [[ $VERSION == 3 ]]; then
export OS_DOMAIN_NAME=${OS_DOMAIN_NAME:-default}
export OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default}
export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-default}
fi