From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Mon, 28 Aug 2017 03:03:57 +0000 (+0800)
Subject: Use legacy storperf images instead of master branch
X-Git-Tag: opnfv-5.0.0~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=acf3b4ff0b556e121d665e31e893c8dc1159f034;p=qtip.git

Use legacy storperf images instead of master branch

The master branch of storperf is under refactoring and not stable
enough for integration. It introduces microservices and some linked
images is not built yet, e.g. storperf-graphite[1] which is required
by storperf-master is empty

[1] https://hub.docker.com/r/opnfv/storperf-graphite

Change-Id: Ie8522dae9073d163872be5742a290fd003698442
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---

diff --git a/resources/ansible_roles/storperf/files/start_job.sh b/resources/ansible_roles/storperf/files/start_job.sh
index 4455609e..19ddbd2f 100755
--- a/resources/ansible_roles/storperf/files/start_job.sh
+++ b/resources/ansible_roles/storperf/files/start_job.sh
@@ -49,7 +49,7 @@ nova_vm_mapping()
     echo ==========================================================================
 }
 
-storperf_api="http://storperf-master:5000/api/v1.0"
+storperf_api="http://storperf:5000/api/v1.0"
 
 echo "QTIP: Waiting for storperf api ready"
 while [ $(curl -s -o /dev/null -I -w "%{http_code}" -X GET ${storperf_api}/configurations) != "200" ]
diff --git a/tests/ci/storperf/qtip-storperf-docker-compose.yaml b/tests/ci/storperf/qtip-storperf-docker-compose.yaml
index 9396a414..a1360200 100644
--- a/tests/ci/storperf/qtip-storperf-docker-compose.yaml
+++ b/tests/ci/storperf/qtip-storperf-docker-compose.yaml
@@ -10,9 +10,9 @@
 version: '2'
 services:
 
-  storperf-master:
-    container_name: storperf-master
-    image: opnfv/storperf-master:${DOCKER_TAG}
+  storperf:
+    container_name: storperf
+    image: opnfv/storperf:${DOCKER_TAG}
     ports:
       - 5000:5000
     env_file: ${ENV_FILE}
@@ -22,4 +22,4 @@ services:
     image: opnfv/qtip:${DOCKER_TAG}
     env_file: ${ENV_FILE}
     links:
-      - storperf-master
+      - storperf