| commit | 202470eca1e5f9a16456220c625a47697abe023c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri May 26 19:33:35 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri May 26 19:33:35 2017 +0000 |
| tree | 88576bb19a50ba0341daad44076c597472cfb7da | |
| parent | 8085df74a888bcf9451bf57ed9da3585a8b4bb20 [diff] | |
| parent | 2715fd0b4acf44842ceb67760bbc348093e7d70d [diff] |
Merge "Do not upload vhdx images as vhd"
diff --git a/functions b/functions index 52a82fa..689aad0 100644 --- a/functions +++ b/functions
@@ -323,7 +323,7 @@ *.vhd|*.vhdx|*.vhd.gz|*.vhdx.gz) local extension="${image_fname#*.}" image_name=$(basename "$image" ".$extension") - disk_format=vhd + disk_format=$(echo $image_fname | grep -oP '(?<=\.)vhdx?(?=\.|$)') container_format=bare if [ "${image_fname##*.}" == "gz" ]; then unpack=zcat