Merge "add project when create user"
authordongwenjuan <dong.wenjuan@zte.com.cn>
Thu, 18 Aug 2016 00:51:23 +0000 (00:51 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 18 Aug 2016 00:51:23 +0000 (00:51 +0000)
tests/run.sh

index 731d2ac..01adf68 100755 (executable)
@@ -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" \