Browse code

Merge "Support decompressing bz2 image"

Jenkins authored on 2016/05/19 10:07:39
Showing 1 changed files
... ...
@@ -298,6 +298,12 @@ function upload_image {
298 298
             container_format=bare
299 299
             unpack=zcat
300 300
             ;;
301
+        *.img.bz2)
302
+            image_name=$(basename "$image" ".img.bz2")
303
+            disk_format=qcow2
304
+            container_format=bare
305
+            unpack=bunzip2
306
+            ;;
301 307
         *.qcow2)
302 308
             image_name=$(basename "$image" ".qcow2")
303 309
             disk_format=qcow2
... ...
@@ -331,6 +337,8 @@ function upload_image {
331 331
     if [ "$container_format" = "bare" ]; then
332 332
         if [ "$unpack" = "zcat" ]; then
333 333
             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}")
334
+        elif [ "$unpack" = "bunzip2" ]; then
335
+            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}")
334 336
         else
335 337
             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}"
336 338
         fi