From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Thu, 18 Aug 2016 13:21:05 +0000 (+0000)
Subject: Merge "fix ssh tunnel creation"
X-Git-Tag: colorado.1.0~19
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=38a2b7c629688a1a8b362e1d4ffb5c8cde965dad;hp=44f1133c8b0087acce42c3cfaf47d011a513423d;p=doctor.git

Merge "fix ssh tunnel creation"
---

diff --git a/tests/run.sh b/tests/run.sh
index 41897003..7531c989 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -139,12 +139,13 @@ register_image() {
 }
 
 create_test_user() {
-    openstack user list | grep -q " $DOCTOR_USER " || {
-        openstack user create "$DOCTOR_USER" --password "$DOCTOR_PW"
-    }
     openstack project list | grep -q " $DOCTOR_PROJECT " || {
         openstack project create "$DOCTOR_PROJECT"
     }
+    openstack user list | grep -q " $DOCTOR_USER " || {
+        openstack user create "$DOCTOR_USER" --password "$DOCTOR_PW" \
+                              --project "$DOCTOR_PROJECT"
+    }
     openstack user role list "$DOCTOR_USER" --project "$DOCTOR_PROJECT" \
     | grep -q " $DOCTOR_ROLE " || {
         openstack role add "$DOCTOR_ROLE" --user "$DOCTOR_USER" \