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/scp_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/scp_storperf_admin-rc.sh')
| -rw-r--r-- | tests/ci/scp_storperf_admin-rc.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_admin-rc.sh index af2885b01..7c3896d88 100644 --- a/tests/ci/scp_storperf_admin-rc.sh +++ b/tests/ci/scp_storperf_admin-rc.sh @@ -1,5 +1,16 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Copy storperf_admin-rc to deployment location. + ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ root@192.168.200.1:/root/ &> /dev/null |