Merge "fix ssh tunnel creation"

diff --combined tests/run.sh
index 01adf68,4189700..7531c98
--- 1/tests/run.sh
--- 2/tests/run.sh
+++ b/tests/run.sh
@@@ -139,13 -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" \
@@@ -211,7 -210,7 +211,7 @@@ start_consumer() 
      # NOTE(r-mibu): create tunnel to the installer node, so that we can
      # avoid some network problems dpends on infra and installers.
      # This tunnel will be terminated by stop_consumer() or after 10 mins passed.
-     TUNNEL_COMMAND="sudo ssh $ssh_opts $INSTALLER_IP -R $CONSUMER_PORT:localhost:$CONSUMER_PORT 'sleep 600'"
+     TUNNEL_COMMAND="sudo ssh $ssh_opts $INSTALLER_IP -R $CONSUMER_PORT:localhost:$CONSUMER_PORT sleep 600"
      $TUNNEL_COMMAND > ssh_tunnel.log 2>&1 < /dev/null &
  }