Refactor vmdk upload code

A syntax error is hit when trying to upload a flat vmdk file that
is accompanied by a descriptor file. The code block that handles
this has some unneeded characters that cause the error. Also,
an else-block has been removed so that we can remove an extra
indent.

Change-Id: Iaf5c914e09da6831eeeec141228b39554a1e2216
Closes-bug: #1288471
Iniset keystone auth version

Introduces support for suth_version config flag in lib/tempest.
The variable is named TEMPEST_AUTH_VERSION, and it can be set
via localrc, so that the devstack-vm-gate-wrap may control it.

The aim is to setup a keystone v3 based experimental check
job in tempest experimental pipeline.

Partially implements bp multi-keystone-api-version-tests

Change-Id: Ia6832d87308c6c7109e6ae0dbd8dff61134718ee
make compute-admin correct

we lost the admin tenant at some point in the last couple of
days which disabled 500 tempest tests. Bring this back.

Change-Id: I5cab2074777cab99982ae8fc4a83663e9d128284
Merge "Iniset keystone auth version"
Merge "make compute-admin correct"
Merge "Refactor vmdk upload code"
Merge branch 'master' of github.com:openstack-dev/devstack