X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fprepare_storperf_admin-rc.sh;h=a6cf97befd23e5dea8ec98ecc6026f589122a998;hb=ab7cd795f6d45bf8bedbe8903cae39bd447d3c19;hp=0401719ff1bdf481e5cbefe1790332b7811ea4f1;hpb=cde1aeb9fcb6b4227f15c667e4da5ac459870a45;p=yardstick.git

diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh
index 0401719ff..a6cf97bef 100755
--- a/tests/ci/prepare_storperf_admin-rc.sh
+++ b/tests/ci/prepare_storperf_admin-rc.sh
@@ -9,14 +9,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+# Prepare storperf_admin-rc for StorPerf.
+
 AUTH_URL=${OS_AUTH_URL}
 USERNAME=${OS_USERNAME:-admin}
 PASSWORD=${OS_PASSWORD:-console}
+
 TENANT_NAME=${OS_TENANT_NAME:-admin}
-VOLUME_API_VERSION=${OS_VOLUME_API_VERSION:-2}
+TENANT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
 PROJECT_NAME=${OS_PROJECT_NAME:-$TENANT_NAME}
-TENANT_ID=`keystone tenant-get admin|grep 'id'|awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
+PROJECT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
 
+USER_DOMAIN_ID=${OS_USER_DOMAIN_ID:-default}
 
 rm -f ~/storperf_admin-rc
 touch ~/storperf_admin-rc
@@ -24,7 +28,8 @@ touch ~/storperf_admin-rc
 echo "OS_AUTH_URL="$AUTH_URL >> ~/storperf_admin-rc
 echo "OS_USERNAME="$USERNAME >> ~/storperf_admin-rc
 echo "OS_PASSWORD="$PASSWORD >> ~/storperf_admin-rc
-echo "OS_TENANT_NAME="$TENANT_NAME >> ~/storperf_admin-rc
-echo "OS_VOLUME_API_VERSION="$VOLUME_API_VERSION >> ~/storperf_admin-rc
 echo "OS_PROJECT_NAME="$PROJECT_NAME >> ~/storperf_admin-rc
+echo "OS_PROJECT_ID="$PROJECT_ID >> ~/storperf_admin-rc
+echo "OS_TENANT_NAME="$TENANT_NAME >> ~/storperf_admin-rc
 echo "OS_TENANT_ID="$TENANT_ID >> ~/storperf_admin-rc
+echo "OS_USER_DOMAIN_ID="$USER_DOMAIN_ID >> ~/storperf_admin-rc