Refactor vmdk upload code
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

varunarya10/devstack,bq-xiao/devstack,dirkmueller/devstack,HPCHub/devstack,sc68cal/devstack,bigswitch/devstack,rushiagr/devstack,nawawi/openstack,costingalan/devstack,rushiagr/devstack,flavio-fernandes/devstack,TwinkleChawla/devstack,openstack-dev/devstack,avvocatodemarchis/devstack,jamielennox/devstack,mmasaki/devstack,j4/devstack,andrewrothstein/devstack,thomasem/devstack,herrsechs/devstack,avvocatodemarchis/devstack,promptworks/devstack,wenhuizhang/devstack,liuquansheng47/devstack,bljgaurav/openstack-test,noironetworks/devstack,sequenceiq/devstack,andrewrothstein/devstack,CloudServer/devstack,bswartz/devstack,HPCHub/devstack,eshnil2000/devstack,promptworks/devstack,richliu/devstack,neerja28/Devstack_GlusterFS,dtroyer/devstack,JioCloud/devstack,vishnugonela/devstack,sequenceiq/devstack,vsham20/devstack,liuquansheng47/devstack,bswartz/devstack,Juniper/devstack,upadhyay-prashant/devstack,neerja28/Devstack_GlusterFS,tianweizhang/devstack,TwinkleChawla/devstack,LoHChina/devstack,williamthegrey/devstack,NaokiMiyata/devstack,dtroyer/devstack,dirkmueller/devstack,innodee/openstackk,olivierlemasle/devstack,NaokiMiyata/devstack,pombredanne/devstack,openstack-dev/devstack,ozamiatin/devstack,olivierlemasle/devstack,kplus/devstack-moonshot,LoHChina/devstack,prithivm/branch01,samgoon/devstack,wenhuizhang/devstack,tianweizhang/devstack,mc2014/devstack,nuxeh/devstack,Mahito/devstack,nuxeh/devstack,flavio-fernandes/devstack,pacinete/devstack,affo/devstack,Mahito/devstack,thomasem/devstack,bigswitch/devstack,bljgaurav/openstack-test,pombredanne/devstack,pczerkas/devstack,j4/devstack,sc68cal/devstack,affo/devstack,parul24/devstack,atulpatil301/devstack,pacinete/devstack,atulpatil301/devstack,ozamiatin/devstack,mc2014/devstack,group-policy/devstack,parul24/devstack,BSJAIN92/OpenStack,BSJAIN92/OpenStack,eharney/devstack,noironetworks/devstack,srics/devstack,richliu/devstack,bq-xiao/devstack,nawawi/openstack,pczerkas/devstack,varunarya10/devstack,mssumanth/devstack,virtualopensystems/devstack,herrsechs/devstack,eharney/devstack,kplus/devstack-moonshot,costingalan/devstack,vishnugonela/devstack,mmasaki/devstack,upadhyay-prashant/devstack,mssumanth/devstack,group-policy/devstack,samgoon/devstack,vsham20/devstack,prithivm/branch01,CloudServer/devstack