From db6ebd22e1d296fc5e6c687384fe6696f4f14af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20J=C3=B3zefczyk?= Date: Thu, 5 Mar 2020 11:25:34 +0100 Subject: [PATCH] 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] https://github.com/cirros-dev/cirros/pull/11/commits/e40bcd2964aa496a9d03e1aaf95cf7a86938f129 [2] https://review.opendev.org/#/c/711492/ Change-Id: Idc614f9f25188bd1a1e1d5424274acf04ba99328 --- devstack/ovn-local.conf.sample | 10 ---------- doc/source/admin/config-qos-min-bw.rst | 2 +- doc/source/install/ovn/tripleo_install.rst | 6 +++--- zuul.d/tempest-multinode.yaml | 7 ------- zuul.d/tempest-singlenode.yaml | 7 ------- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/devstack/ovn-local.conf.sample b/devstack/ovn-local.conf.sample index 5914c9dc37b..c48f59d6199 100644 --- a/devstack/ovn-local.conf.sample +++ b/devstack/ovn-local.conf.sample @@ -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 diff --git a/doc/source/admin/config-qos-min-bw.rst b/doc/source/admin/config-qos-min-bw.rst index 1db7f4a599d..14b99a8d523 100644 --- a/doc/source/admin/config-qos-min-bw.rst +++ b/doc/source/admin/config-qos-min-bw.rst @@ -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 diff --git a/doc/source/install/ovn/tripleo_install.rst b/doc/source/install/ovn/tripleo_install.rst index 32406e5127d..3d689541363 100644 --- a/doc/source/install/ovn/tripleo_install.rst +++ b/doc/source/install/ovn/tripleo_install.rst @@ -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 \ diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 299df5970c7..6c65fed2472 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -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 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 3eced4ecd33..370b07d5268 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -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