From: Ryota Mibu Date: Fri, 22 Jul 2016 12:33:07 +0000 (+0000) Subject: Merge "Unset default COMPUTE_USER at the beginning of tests" X-Git-Tag: colorado.1.0~45 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=doctor.git;a=commitdiff_plain;h=6f510bab7302c22680cdead42e99fd623d4679f7 Merge "Unset default COMPUTE_USER at the beginning of tests" --- 6f510bab7302c22680cdead42e99fd623d4679f7 diff --cc tests/run.sh index 0e984ee9,f6461131..0d9e08a0 --- a/tests/run.sh +++ b/tests/run.sh @@@ -28,11 -28,8 +28,10 @@@ DOCTOR_ROLE=admi SUPPORTED_INSTALLER_TYPES="apex local" INSTALLER_TYPE=${INSTALLER_TYPE:-apex} INSTALLER_IP=${INSTALLER_IP:-none} - COMPUTE_USER=${COMPUTE_USER:-none} ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +as_doctor_user="--os-username $DOCTOR_USER --os-password $DOCTOR_PW + --os-tenant-name $DOCTOR_PROJECT" if [[ ! "$SUPPORTED_INSTALLER_TYPES" =~ "$INSTALLER_TYPE" ]] ; then echo "ERROR: INSTALLER_TYPE=$INSTALLER_TYPE is not supported."