diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2016-12-16 14:38:16 +0800 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2016-12-16 16:39:45 +0800 |
| commit | 92f30ababa567dffb9fea221f03f9470b088e067 (patch) | |
| tree | 9e88f0b1c25f09cff608283556683a892b7f94d7 /tests/ci/prepare_storperf_admin-rc.sh | |
| parent | 96b30b364a0b88a15c38bd22883bb40bbcb6f428 (diff) | |
Use openstack command instead keystone command in prepare_storperf_admin-rc.sh
JIRA: YARDSTICK-476
In Openstack Newton, the ”tenant“ is deprecated and "project" is used.
The prepare_storperf_admin-rc.sh uses keystone command to get "tenant id".
So for newton, we need to use openstack command to get "project id".
This patch also add a copy right header in tests/ci/scp_storperf_admin-rc.sh.
Change-Id: Ic69cb07f684ccb557866a4141e9d2724fc054f29
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/prepare_storperf_admin-rc.sh')
| -rwxr-xr-x | tests/ci/prepare_storperf_admin-rc.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh index 0401719ff..b3dc2e58e 100755 --- 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 |