From 62ea8774e87b635e6a1c5e9fdf8d5a3f6177cf52 Mon Sep 17 00:00:00 2001 From: Haiwei Xu Date: Thu, 2 Jul 2015 17:37:02 +0900 Subject: [PATCH] Fix senlinrc to support keystone v2 and v3 on the client side Change-Id: I463e5a96d7ae6702d1e433553a4d16d6c22ad8c0 --- tools/senlinrc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/senlinrc b/tools/senlinrc index e1cfe663..5bb256cf 100644 --- a/tools/senlinrc +++ b/tools/senlinrc @@ -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