@@ -657,20 +657,19 @@ esac
657657# If the file ends in .tar.gz, uncompress the tarball and and select the first
658658# .img file inside it as the image. If present, use "*-vmlinuz*" as the kernel
659659# and "*-initrd*" as the ramdisk
660- # example: http ://cloud-images.ubuntu.com/releases/precise /release/ubuntu-12 .04-server-cloudimg-amd64.tar.gz
660+ # example: https ://cloud-images.ubuntu.com/releases/jammy /release/ubuntu-22 .04-server-cloudimg-amd64.tar.gz
661661# * disk image (*.img,*.img.gz)
662662# if file ends in .img, then it will be uploaded and registered as a to
663663# glance as a disk image. If it ends in .gz, it is uncompressed first.
664664# example:
665- # http ://cloud-images.ubuntu.com/releases/precise /release/ubuntu-12 .04-server-cloudimg-armel-disk1 .img
666- # http ://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz
665+ # https ://cloud-images.ubuntu.com/releases/jammy /release/ubuntu-22 .04-server-cloudimg-amd64 .img
666+ # https ://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz
667667# * OpenVZ image:
668668# OpenVZ uses its own format of image, and does not support UEC style images
669669
670- # IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image
671- # IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
670+ # IMAGE_URLS="https://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
672671
673- CIRROS_VERSION=${CIRROS_VERSION:- " 0.5.2 " }
672+ CIRROS_VERSION=${CIRROS_VERSION:- " 0.6.1 " }
674673CIRROS_ARCH=${CIRROS_ARCH:- $(uname -m)}
675674
676675# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
@@ -687,11 +686,11 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
687686 lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
688687 DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:- cirros-${CIRROS_VERSION} -${CIRROS_ARCH} -rootfs}
689688 DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:- cirros-${CIRROS_VERSION} -${CIRROS_ARCH} -rootfs.img.gz}
690- IMAGE_URLS+=" http ://download.cirros-cloud.net/${CIRROS_VERSION} /${DEFAULT_IMAGE_FILE_NAME} " ;;
689+ IMAGE_URLS+=" https ://download.cirros-cloud.net/${CIRROS_VERSION} /${DEFAULT_IMAGE_FILE_NAME} " ;;
691690 * ) # otherwise, use the qcow image
692691 DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:- cirros-${CIRROS_VERSION} -${CIRROS_ARCH} -disk}
693692 DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:- cirros-${CIRROS_VERSION} -${CIRROS_ARCH} -disk.img}
694- IMAGE_URLS+=" http ://download.cirros-cloud.net/${CIRROS_VERSION} /${DEFAULT_IMAGE_FILE_NAME} " ;;
693+ IMAGE_URLS+=" https ://download.cirros-cloud.net/${CIRROS_VERSION} /${DEFAULT_IMAGE_FILE_NAME} " ;;
695694 esac
696695 ;;
697696 vsphere)
0 commit comments