From: dongwenjuan Date: Thu, 18 Aug 2016 00:51:23 +0000 (+0000) Subject: Merge "add project when create user" X-Git-Tag: colorado.1.0~20 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c0a49e9c8f74832ee9f67630275e75e42296fe00;hp=a6795a5dec13bccd3113975a206a5e1c44fc3efc;p=doctor.git Merge "add project when create user" --- diff --git a/tests/run.sh b/tests/run.sh index 731d2ac6..01adf689 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" \