openstack/python-senlinclient
Code Issues Proposed changes

Fix senlinrc to support keystone v2 and v3 on the client side

Browse Source 
Change-Id: I463e5a96d7ae6702d1e433553a4d16d6c22ad8c0
This commit is contained in:
Haiwei Xu
2015-07-02 17:37:02 +09:00
parent 608589c916
commit 62ea8774e8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/senlinrc
View File

@@ -11,7 +11,7 @@ unset OS_USER_DOMAIN_NAME
unset OS_TENANT_NAME
unset OS_AUTH_URL
VERSION=${IDENTITY_API_VERSION:-3}
VERSION=${OS_IDENTITY_API_VERSION:-3}
if [[ -n "$1" ]]; then
OS_USERNAME=$1
@@ -22,8 +22,8 @@ fi
OS_PROJECT_NAME=${OS_PROJECT_NAME:-demo}
export OS_USERNAME=${OS_USERNAME:-demo}
export OS_PASSWORD=${OS_PASSWORD:-cheerman}
export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}
export OS_PASSWORD=openstack
export OS_REGION_NAME=RegionOne
HOST_IP=${HOST_IP:-127.0.0.1}
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
@@ -34,7 +34,6 @@ HOST=${HOST:-$SERVICE_HOST}
export OS_AUTH_URL=$PROTOCOL://$HOST:5000/v${VERSION}
if [[ $VERSION == 3 ]]; then
export OS_PROJECT_NAME=${OS_PROJECT_NAME}
# 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}
else