openstack/devstack
Code Issues Proposed changes

upload_image.sh to support streamOptimized disks

Browse Source 
The current version of the script will use "preallocated" as the
disk type of a stream optimized disk. This needs to be fixed by
introspecting the createType of the vmdk file.

Closes-Bug: #1275993

Change-Id: I98594acecf26dd1164870f43890254a19ef23fe9
This commit is contained in:
Arnaud Legendre 2014-02-03 17:57:39 -08:00
parent b7bdb68b62
commit 8dad4bde88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions
View File

@ -1450,7 +1450,7 @@ function upload_image() {
# vmdk disk type # vmdk disk type
vmdk_create_type="$(head -25 $IMAGE | grep -a -F -m 1 'createType=' $IMAGE)" vmdk_create_type="$(head -25 $IMAGE | grep -a -F -m 1 'createType=' $IMAGE)"
vmdk_create_type="${vmdk_create_type#*\"}" vmdk_create_type="${vmdk_create_type#*\"}"
vmdk_create_type="${vmdk_create_type%?}" vmdk_create_type="${vmdk_create_type%\"*}"
descriptor_data_pair_msg="Monolithic flat and VMFS disks "` descriptor_data_pair_msg="Monolithic flat and VMFS disks "`
`"should use a descriptor-data pair." `"should use a descriptor-data pair."
@ -1495,6 +1495,8 @@ function upload_image() {
IMAGE_NAME="${flat_fname}" IMAGE_NAME="${flat_fname}"
fi fi
vmdk_disktype="preallocated" vmdk_disktype="preallocated"
elif [[ "$vmdk_create_type" = "streamOptimized" ]]; then
vmdk_disktype="streamOptimized"
elif [[ -z "$vmdk_create_type" ]]; then elif [[ -z "$vmdk_create_type" ]]; then
# *-flat.vmdk provided: attempt to retrieve the descriptor (*.vmdk) # *-flat.vmdk provided: attempt to retrieve the descriptor (*.vmdk)
# to retrieve appropriate metadata # to retrieve appropriate metadata
@ -1533,10 +1535,8 @@ function upload_image() {
vmdk_adapter_type="${vmdk_adapter_type%?}" vmdk_adapter_type="${vmdk_adapter_type%?}"
fi fi
fi fi
#TODO(alegendre): handle streamOptimized once supported by the VMware driver.
vmdk_disktype="preallocated" vmdk_disktype="preallocated"
else else
#TODO(alegendre): handle streamOptimized once supported by the VMware driver.
vmdk_disktype="preallocated" vmdk_disktype="preallocated"
fi fi