From ff3bef0324ce0d3cc959edc994dd77bc7d297e65 Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Tue, 20 Jan 2015 17:18:33 +0800
Subject: [PATCH] Make v3 the default backend for authentication

Don't export OS_DOMAIN_NAME if we want a project scope authentication.
---
 senlinrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/senlinrc b/senlinrc
index e0eee7de..e1cfe663 100644
--- a/senlinrc
+++ b/senlinrc
@@ -11,7 +11,7 @@ unset OS_USER_DOMAIN_NAME
 unset OS_TENANT_NAME
 unset OS_AUTH_URL
 
-VERSION=${IDENTITY_API_VERSION:-2.0}
+VERSION=${IDENTITY_API_VERSION:-3}
 
 if [[ -n "$1" ]]; then
     OS_USERNAME=$1
@@ -33,8 +33,8 @@ HOST=${HOST:-$SERVICE_HOST}
 
 export OS_AUTH_URL=$PROTOCOL://$HOST:5000/v${VERSION}
 if [[ $VERSION == 3 ]]; then
-  export OS_PROJECT_NAME
-  export OS_DOMAIN_NAME=${OS_DOMAIN_NAME:-default}
+  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