Updated openstack/openstack
Project: openstack-dev/devstack  33cd549f71809b9b6d6cd07b380213c8e4cfbaff
null
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