openstack/devstack
Code Issues Proposed changes

Merge "Support upload of qcow2.xz image format"

Browse Source
This commit is contained in:
Zuul 2020-04-23 09:01:44 +00:00 committed by Gerrit Code Review
commit 1b01f23b74
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
functions
View File

@ -341,6 +341,12 @@ function upload_image {
disk_format=qcow2 disk_format=qcow2
container_format=bare container_format=bare
;; ;;
*.qcow2.xz)
image_name=$(basename "$image" ".qcow2.xz")
disk_format=qcow2
container_format=bare
unpack=unxz
;;
*.raw) *.raw)
image_name=$(basename "$image" ".raw") image_name=$(basename "$image" ".raw")
disk_format=raw disk_format=raw
@ -376,6 +382,16 @@ function upload_image {
openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < <(zcat --force "${image}") openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < <(zcat --force "${image}")
elif [ "$unpack" = "bunzip2" ]; then elif [ "$unpack" = "bunzip2" ]; then
openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < <(bunzip2 -cdk "${image}") openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < <(bunzip2 -cdk "${image}")
elif [ "$unpack" = "unxz" ]; then
# NOTE(brtknr): unxz the file first and cleanup afterwards to
# prevent timeout while Glance tries to upload image (e.g. to Swift).
local tmp_dir
local image_path
tmp_dir=$(mktemp -d)
image_path="$tmp_dir/$image_name"
unxz -cv "${image}" > "$image_path"
openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format --file "$image_path"
rm -rf $tmp_dir
else else
openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < "${image}" openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < "${image}"
fi fi