openstack/tacker
Code Issues Proposed changes

Merge "Fix to upload as the appropriate image format"

Browse Source
This commit is contained in:
Zuul 2023-03-03 08:50:46 +00:00 committed by Gerrit Code Review
commit 7c7f54e559
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/tacker
View File

@ -362,9 +362,9 @@ function tacker_horizon_uninstall {
function openstack_image_create { function openstack_image_create {
image=$1 image=$1
disk_format=raw
container_format=bare container_format=bare
image_name=$2 image_name=$2
disk_format=$3
openstack --os-cloud=devstack-admin image create $image_name --public --container-format=$container_format --disk-format $disk_format --file ${image} openstack --os-cloud=devstack-admin image create $image_name --public --container-format=$container_format --disk-format $disk_format --file ${image}
openstack image show $image_name -f value -c id openstack image show $image_name -f value -c id
} }
@ -380,6 +380,8 @@ function tacker_check_and_download_images {
local gz_pattern="\.gz$" local gz_pattern="\.gz$"
local length=${#image_url[@]} local length=${#image_url[@]}
local index=0 local index=0
install_package jq
while [ $index -lt $length ] while [ $index -lt $length ]
do do
image_fname=`basename "${image_url[$index]}"` image_fname=`basename "${image_url[$index]}"`
@ -408,7 +410,8 @@ function tacker_check_and_download_images {
fi fi
fi fi
{ {
openstack_image_create $FILES/$image_fname $glance_name disk_format=`qemu-img info --output=json $FILES/$image_fname | jq -r '.format'`
openstack_image_create $FILES/$image_fname $glance_name $disk_format
}||{ }||{
echo "ERROR: tacker image create for $image_fname failed" echo "ERROR: tacker image create for $image_fname failed"
image_fname=$image_fname"*" image_fname=$image_fname"*"