Update cirros image to cirros-0.5.1-x86_64 globally

New cirros with recent fixes for metadata service
has been released. Lets update the image version on gate.

Also stop using different images for OVN. Lets use default
settings from devstack.

First we need to merge [2].

[1] e40bcd2964
[2] https://review.opendev.org/#/c/711492/

Change-Id: Idc614f9f25188bd1a1e1d5424274acf04ba99328
This commit is contained in:
Maciej Józefczyk 2020-03-05 11:25:34 +01:00
parent a3c7aad790
commit db6ebd22e1
5 changed files with 4 additions and 28 deletions

View File

@ -52,16 +52,6 @@ enable_service q-qos
# Enable neutron tempest plugin tests
enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
# To enable the advanced images tempest tests, uncomment the lines below:
#DOWNLOAD_DEFAULT_IMAGES=False
#IMAGE_URLS="http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img,https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
#DEFAULT_IMAGE_NAME=cirros-0.4.0-x86_64-disk
#DEFAULT_IMAGE_FILE_NAME=cirros-0.4.0-x86_64-disk.img
#ADVANCED_IMAGE_NAME=ubuntu-16.04-server-cloudimg-amd64-disk1
#ADVANCED_INSTANCE_TYPE=ds512M
#ADVANCED_INSTANCE_USER=ubuntu
#BUILD_TIMEOUT=784
# Horizon (the web UI) is enabled by default. You may want to disable
# it here to speed up DevStack a bit.
enable_service horizon

View File

@ -390,7 +390,7 @@ servers with those ports:
$ openstack server create server0 \
--flavor cirros256 \
--image cirros-0.4.0-x86_64-disk \
--image cirros-0.5.1-x86_64-disk \
--port port-normal-qos
On Healing of Allocations

View File

@ -206,9 +206,9 @@ You can use the following script to create the resources.
source ~/overcloudrc
curl http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img \
> cirros-0.4.0-x86_64-disk.img
openstack image create "cirros" --file cirros-0.4.0-x86_64-disk.img \
curl http://download.cirros-cloud.net/0.5.0/cirros-0.5.1-x86_64-disk.img \
> cirros-0.5.1-x86_64-disk.img
openstack image create "cirros" --file cirros-0.5.1-x86_64-disk.img \
--disk-format qcow2 --container-format bare --public
openstack network create public --provider-physical-network datacentre \

View File

@ -122,13 +122,6 @@
# will be released in Ubuntu Bionic.
# More info: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-December/048009.html
OVN_BUILD_MODULES: True
DOWNLOAD_DEFAULT_IMAGES: false
IMAGE_URLS: "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img,https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
DEFAULT_IMAGE_NAME: cirros-0.4.0-x86_64-disk
DEFAULT_IMAGE_FILE_NAME: cirros-0.4.0-x86_64-disk.img
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
ADVANCED_INSTANCE_TYPE: ds512M
ADVANCED_INSTANCE_USER: ubuntu
BUILD_TIMEOUT: 784
ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True

View File

@ -234,13 +234,6 @@
# More info: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-December/048009.html
OVN_BUILD_MODULES: True
USE_PYTHON3: True
DOWNLOAD_DEFAULT_IMAGES: false
IMAGE_URLS: "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img,https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
DEFAULT_IMAGE_NAME: cirros-0.4.0-x86_64-disk
DEFAULT_IMAGE_FILE_NAME: cirros-0.4.0-x86_64-disk.img
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
ADVANCED_INSTANCE_TYPE: ds512M
ADVANCED_INSTANCE_USER: ubuntu
BUILD_TIMEOUT: 784
ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True