Updated openstack/openstack
Project: openstack-dev/devstack  d24a053a96cbc6f91b8ddef8c74a3ede90be5b39
null
Add Neutron/NSX plugin sanity check

Supports-blueprint: nvp-third-party-support (aka bp vmware-nsx-third-party)
Related-bug: #1265671

Change-Id: Ifa4e1d36b8735e81f24b8852103a9c433d736e84
Updated openstack/openstack
Project: openstack-dev/devstack  58cc03629fd4af1239bed59bd70eb7339bb9976d
null
upload_image.sh should parse filenames correctly

The upload_image script gives the ability to the user to provide
specific metadata using the filename:
file-adapter_type;disk_type;network_type.vmdk
Currently, the regex expects each of these types to be populated.
This patch fixes this issue by making the regex more flexible and
accepts only one of these metadata to be populated.

Change-Id: If74cb06cc640864e7e91fd88943cdb37e05935d6
Closes-Bug: #1272126