Skip to content

Commit 37d11d0

Browse files
author
Ghanshyam
committed
Revert "Bump cirros version to 0.6.1"
This reverts commit 91efe17. Reason for revert: it broke tempest-slow job https://9afe3d390e4175b60a80-89b1085289883615a17bd93ef47f6ca9.ssl.cf5.rackcdn.com/871018/13/gate/tempest-slow-py3/d139ae1/testr_results.html Change-Id: Ib74e51a780d3e8101f4147db9d24eebea4980fb1
1 parent 91efe17 commit 37d11d0

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎doc/source/guides/nova.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ when creating the server, for example:
122122
.. code-block:: shell
123123
124124
$ openstack --os-compute-api-version 2.37 server create --flavor cirros256 \
125-
--image cirros-0.6.1-x86_64-disk --nic none --wait test-server
125+
--image cirros-0.3.5-x86_64-disk --nic none --wait test-server
126126
127127
.. note:: ``--os-compute-api-version`` greater than or equal to 2.37 is
128128
required to use ``--nic=none``.

‎stackrc‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -657,19 +657,20 @@ 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: https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.tar.gz
660+
# example: http://cloud-images.ubuntu.com/releases/precise/release/ubuntu-12.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-
# 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
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
667667
# * OpenVZ image:
668668
# OpenVZ uses its own format of image, and does not support UEC style images
669669

670-
#IMAGE_URLS="https://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
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
671672

672-
CIRROS_VERSION=${CIRROS_VERSION:-"0.6.1"}
673+
CIRROS_VERSION=${CIRROS_VERSION:-"0.5.2"}
673674
CIRROS_ARCH=${CIRROS_ARCH:-$(uname -m)}
674675

675676
# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
@@ -686,11 +687,11 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
686687
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
687688
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs}
688689
DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz}
689-
IMAGE_URLS+="https://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";;
690+
IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";;
690691
*) # otherwise, use the qcow image
691692
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk}
692693
DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
693-
IMAGE_URLS+="https://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";;
694+
IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";;
694695
esac
695696
;;
696697
vsphere)

0 commit comments

Comments
 (0)