Merge "BugFix: update to paramiko 1.18.0 to fix TypeError"

[yardstick.git] / tests / ci / prepare_storperf_admin-rc.sh

diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh
index 0401719..b3dc2e5 100755 (executable)
--- a/tests/ci/prepare_storperf_admin-rc.sh
+++ b/tests/ci/prepare_storperf_admin-rc.sh
@@ -9,14 +9,15 @@
 # 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}
 PROJECT_NAME=${OS_PROJECT_NAME:-$TENANT_NAME}
-TENANT_ID=`keystone tenant-get admin|grep 'id'|awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
-
+TENANT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
 
 rm -f ~/storperf_admin-rc
 touch ~/storperf_admin-rc