aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ci/prepare_storperf_admin-rc.sh
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-03-23 07:53:10 +0000
committerJingLu5 <lvjing5@huawei.com>2017-03-25 00:43:24 +0000
commit0691766d310e00d7f1cec763427db271076b5633 (patch)
tree5840532a200ff2fb3501022464d9594b95d7bd6b /tests/ci/prepare_storperf_admin-rc.sh
parent91aefe442153517a35c87e1fc02a30c2917c3783 (diff)
Bugfix:add storperf flavor for TC074
JIRA: YARDSTICK-604 the storperf container now uses a flavor called "storperf", if this flavor is absent, stack creating process will fail. also the openstack variables that passed to the storperf container also needs a update Change-Id: Iab4be6491cc9b24526948e5571f0476ec885a93d Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/prepare_storperf_admin-rc.sh')
-rwxr-xr-xtests/ci/prepare_storperf_admin-rc.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh
index b3dc2e58e..a6cf97bef 100755
--- a/tests/ci/prepare_storperf_admin-rc.sh
+++ b/tests/ci/prepare_storperf_admin-rc.sh
@@ -14,10 +14,13 @@
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=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'`
+PROJECT_NAME=${OS_PROJECT_NAME:-$TENANT_NAME}
+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
@@ -25,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