Merge "Fix typo in property passed to glance"

This commit is contained in:
Jenkins 2013-10-06 08:42:08 +00:00 committed by Gerrit Code Review
commit 125c29f99e

View File

@ -1335,7 +1335,7 @@ function upload_image() {
vmdk_net_adapter="${props[2]}" vmdk_net_adapter="${props[2]}"
fi fi
glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format bare --disk-format vmdk --property vmware-disktype="$vmdk_disktype" --property vmware_adaptertype="$vmdk_adapter_type" --property hw_vif_model="$vmdk_net_adapter" < "${IMAGE}" glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format bare --disk-format vmdk --property vmware_disktype="$vmdk_disktype" --property vmware_adaptertype="$vmdk_adapter_type" --property hw_vif_model="$vmdk_net_adapter" < "${IMAGE}"
return return
fi fi