Syntax error when uploading a vmdk with a descriptor with upload_image.sh

[Ryan Hsu]

A syntax error is seen when uploading a flat vmdk (that is accompanied by a descriptor file) with upload_image.sh. The error is:

functions: command substitution: line 195: syntax error near unexpected token `}'
functions: command substitution: line 195: ` `" { grep -a -F -m 1 'ddb.adapterType =' $descriptor_url || true; })"'

The problem is due to the unneeded backtick and quotes when assigning "vmdk_adapter_type" variable.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/78453

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/78453
Committed: https://git.openstack.org/cgit/openstack-dev/devstack/commit/?id=99b622a936c0b6f5b6283f3bcdca3bd7d0628e29
Submitter: Jenkins
Branch: master

commit 99b622a936c0b6f5b6283f3bcdca3bd7d0628e29
Author: Ryan Hsu <email address hidden>
Date: Wed Mar 5 15:35:49 2014 -0800

    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