openstack/devstack
Code Issues Proposed changes

Fix upload function for vmdk files

Browse Source 
Fix all grep statements failing under -o errexit.

Change-Id: I0591a2ba7351d598eb5b29d68a83ce6290600938
This commit is contained in:
Sreeram Yerrapragada 2014-03-03 21:34:45 -08:00
parent 9f935cbd4a
commit 314af0a7a9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions
View File

@ -55,7 +55,7 @@ function upload_image {
mkdir -p $FILES/images mkdir -p $FILES/images
IMAGE_FNAME=`basename "$image_url"` IMAGE_FNAME=`basename "$image_url"`
if [[ $image_url != file* ]]; then if [[ $image_url != file* ]]; then
# Downloads the image (uec ami+aki style), then extracts it. # Downloads the image (uec ami+akistyle), then extracts it.
if [[ ! -f $FILES/$IMAGE_FNAME || "$(stat -c "%s" $FILES/$IMAGE_FNAME)" = "0" ]]; then if [[ ! -f $FILES/$IMAGE_FNAME || "$(stat -c "%s" $FILES/$IMAGE_FNAME)" = "0" ]]; then
wget -c $image_url -O $FILES/$IMAGE_FNAME wget -c $image_url -O $FILES/$IMAGE_FNAME
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
@ -103,12 +103,12 @@ function upload_image {
vmdk_net_adapter="" vmdk_net_adapter=""
# vmdk adapter type # vmdk adapter type
vmdk_adapter_type="$(head -25 $IMAGE | grep -a -F -m 1 'ddb.adapterType =' $IMAGE)" vmdk_adapter_type="$(head -25 $IMAGE | { grep -a -F -m 1 'ddb.adapterType =' $IMAGE || true; })"
vmdk_adapter_type="${vmdk_adapter_type#*\"}" vmdk_adapter_type="${vmdk_adapter_type#*\"}"
vmdk_adapter_type="${vmdk_adapter_type%?}" vmdk_adapter_type="${vmdk_adapter_type%?}"
# 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 || true; })"
vmdk_create_type="${vmdk_create_type#*\"}" vmdk_create_type="${vmdk_create_type#*\"}"
vmdk_create_type="${vmdk_create_type%\"*}" vmdk_create_type="${vmdk_create_type%\"*}"
@ -119,7 +119,7 @@ function upload_image {
elif [[ "$vmdk_create_type" = "monolithicFlat" || \ elif [[ "$vmdk_create_type" = "monolithicFlat" || \
"$vmdk_create_type" = "vmfs" ]]; then "$vmdk_create_type" = "vmfs" ]]; then
# Attempt to retrieve the *-flat.vmdk # Attempt to retrieve the *-flat.vmdk
flat_fname="$(head -25 $IMAGE | grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $IMAGE)" flat_fname="$(head -25 $IMAGE | { grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $IMAGE || true; })"
flat_fname="${flat_fname#*\"}" flat_fname="${flat_fname#*\"}"
flat_fname="${flat_fname%?}" flat_fname="${flat_fname%?}"
if [[ -z "$flat_name" ]]; then if [[ -z "$flat_name" ]]; then
@ -190,7 +190,7 @@ function upload_image {
fi fi
if $descriptor_found; then if $descriptor_found; then
vmdk_adapter_type="$(head -25 $descriptor_url |"` vmdk_adapter_type="$(head -25 $descriptor_url |"`
`"grep -a -F -m 1 'ddb.adapterType =' $descriptor_url)" `" { grep -a -F -m 1 'ddb.adapterType =' $descriptor_url || true; })"
vmdk_adapter_type="${vmdk_adapter_type#*\"}" vmdk_adapter_type="${vmdk_adapter_type#*\"}"
vmdk_adapter_type="${vmdk_adapter_type%?}" vmdk_adapter_type="${vmdk_adapter_type%?}"
fi fi
@ -203,7 +203,7 @@ function upload_image {
# NOTE: For backwards compatibility reasons, colons may be used in place # NOTE: For backwards compatibility reasons, colons may be used in place
# of semi-colons for property delimiters but they are not permitted # of semi-colons for property delimiters but they are not permitted
# characters in NTFS filesystems. # characters in NTFS filesystems.
property_string=`echo "$IMAGE_NAME" | grep -oP '(?<=-)(?!.*-).*[:;].*[:;].*$'` property_string=`echo "$IMAGE_NAME" | { grep -oP '(?<=-)(?!.*-).*[:;].*[:;].*$' || true; }`
IFS=':;' read -a props <<< "$property_string" IFS=':;' read -a props <<< "$property_string"
vmdk_disktype="${props[0]:-$vmdk_disktype}" vmdk_disktype="${props[0]:-$vmdk_disktype}"
vmdk_adapter_type="${props[1]:-$vmdk_adapter_type}" vmdk_adapter_type="${props[1]:-$vmdk_adapter_type}"