From fc365b8dd52b90a242c1c6a6b67795bfe4c3dda8 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Thu, 12 Oct 2023 13:45:53 -0500 Subject: [PATCH] Bump Cirros image version to 0.6.2 In Bobcat by default the ssh keypair is generated with ed25519 algorithm which is incompatible with Cirros 0.3.5. The Cirros 0.6.2 also requires minimum 128Mi of RAM Change-Id: I0135c09a9ae5bc3171891576b29a450f7000f180 --- glance/Chart.yaml | 2 +- glance/values.yaml | 12 +- rally/Chart.yaml | 2 +- rally/values.yaml | 230 +++++++++--------- releasenotes/notes/glance.yaml | 1 + releasenotes/notes/rally.yaml | 1 + releasenotes/notes/tempest.yaml | 1 + tempest/Chart.yaml | 2 +- tempest/values.yaml | 2 +- tools/deployment/component/glance/glance.sh | 2 +- tools/deployment/developer/ceph/120-glance.sh | 2 +- tools/deployment/developer/nfs/120-glance.sh | 2 +- tools/deployment/multinode/100-glance.sh | 2 +- .../gate/files/heat-basic-bm-deployment.yaml | 2 +- .../gate/files/heat-basic-vm-deployment.yaml | 4 +- 15 files changed, 134 insertions(+), 133 deletions(-) diff --git a/glance/Chart.yaml b/glance/Chart.yaml index c8e0df8e2f..99aa25535a 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.4.13 +version: 0.4.14 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/values.yaml b/glance/values.yaml index 2406a35d88..098c46ffbb 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -64,9 +64,9 @@ bootstrap: images: cirros: id: null - name: "Cirros 0.3.5 64-bit" - source_url: "http://download.cirros-cloud.net/0.3.5/" - image_file: "cirros-0.3.5-x86_64-disk.img" + name: "Cirros 0.6.2 64-bit" + source_url: "http://download.cirros-cloud.net/0.6.2/" + image_file: "cirros-0.6.2-x86_64-disk.img" min_disk: 1 image_type: qcow2 container_format: bare @@ -99,8 +99,7 @@ conf: - args: container_format: bare disk_format: qcow2 - # NOTE(aostapenko) temporary location to work around https://bugs.launchpad.net/rally/+bug/1887705 - image_location: https://artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img + image_location: http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img runner: concurrency: 1 times: 1 @@ -112,8 +111,7 @@ conf: - args: container_format: bare disk_format: qcow2 - # NOTE(aostapenko) temporary location to work around https://bugs.launchpad.net/rally/+bug/1887705 - image_location: https://artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img + image_location: http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img runner: concurrency: 1 times: 1 diff --git a/rally/Chart.yaml b/rally/Chart.yaml index 1f20bf4058..778b33d34a 100644 --- a/rally/Chart.yaml +++ b/rally/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm rally name: rally -version: 0.2.7 +version: 0.2.8 home: https://docs.openstack.org/developer/rally icon: https://www.openstack.org/themes/openstack/images/project-mascots/rally/OpenStack_Project_rally_vertical.png sources: diff --git a/rally/values.yaml b/rally/values.yaml index 3bbc0ae415..669fb65a9c 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -1448,15 +1448,15 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: 10 context: users: tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1471,7 +1471,7 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: max: 5 min: 1 @@ -1480,8 +1480,8 @@ conf: tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1507,15 +1507,15 @@ conf: - args: image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: 1 context: users: tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1668,7 +1668,7 @@ conf: do_delete: true force: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: 1 context: users: @@ -1685,7 +1685,7 @@ conf: do_delete: true force: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: max: 5 min: 1 @@ -1694,8 +1694,8 @@ conf: tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1744,14 +1744,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img servers_per_tenant: 2 users: tenants: 2 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1771,14 +1771,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img servers_per_tenant: 2 users: tenants: 2 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -1797,14 +1797,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img servers_per_tenant: 2 users: tenants: 2 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -2943,7 +2943,7 @@ conf: boot_server_kwargs: {} disk: 1 image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img metadata: test_metadata: "true" ram: 512 @@ -2953,8 +2953,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3216,7 +3216,7 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: network: start_cidr: 100.1.0.0/26 @@ -3224,8 +3224,8 @@ conf: tenants: 2 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3259,15 +3259,15 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: network: {} users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3291,14 +3291,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3313,14 +3313,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3335,14 +3335,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3356,7 +3356,7 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: network: networks_per_tenant: 2 @@ -3365,8 +3365,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3380,14 +3380,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3402,14 +3402,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3424,14 +3424,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3445,14 +3445,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3466,16 +3466,16 @@ conf: flavor: name: m1.tiny from_image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img to_image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3489,14 +3489,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3510,14 +3510,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3531,14 +3531,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3552,14 +3552,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3573,15 +3573,15 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: network: {} users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3601,15 +3601,15 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img size: 10 context: users: tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3628,7 +3628,7 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img to_flavor: name: m1.small volume_size: 1 @@ -3637,8 +3637,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3652,7 +3652,7 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img volume_size: 10 volume_type: "" context: @@ -3660,8 +3660,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3676,7 +3676,7 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img volume_size: 10 volume_type: "" context: @@ -3684,8 +3684,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3701,7 +3701,7 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img volume_size: 10 volume_type: "" context: @@ -3709,8 +3709,8 @@ conf: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3729,7 +3729,7 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img to_flavor: name: m1.small volume_size: 1 @@ -3738,8 +3738,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3753,7 +3753,7 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img volume_size: 10 volume_type: "" context: @@ -3761,8 +3761,8 @@ conf: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3779,14 +3779,14 @@ conf: flavor: name: m1.tiny image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img servers_per_tenant: 2 users: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3801,14 +3801,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3824,7 +3824,7 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img to_flavor: name: m1.small context: @@ -3832,8 +3832,8 @@ conf: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3848,14 +3848,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3870,14 +3870,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3892,14 +3892,14 @@ conf: name: m1.tiny force_delete: false image: - name: cirros-0.3.5-x86_64-disk.img + name: cirros-0.6.2-x86_64-disk.img context: users: tenants: 3 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 @@ -3935,8 +3935,8 @@ conf: tenants: 1 users_per_tenant: 1 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img + image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" + image_name: cirros-0.6.2-x86_64-disk.img image_type: qcow2 image_container: bare images_per_tenant: 1 diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 4f1d45c456..d009af34c2 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -47,4 +47,5 @@ glance: - 0.4.11 Bring liveness/readiness params out to values.yaml - 0.4.12 Add flag `keep_pvc` to allows set helm resource-policy for glance-images PVC to keep. - 0.4.13 Add Ubuntu Jammy overrides + - 0.4.14 Bump Cirros version to 0.6.2 ... diff --git a/releasenotes/notes/rally.yaml b/releasenotes/notes/rally.yaml index 1fc5c7e2bf..0b8087c0aa 100644 --- a/releasenotes/notes/rally.yaml +++ b/releasenotes/notes/rally.yaml @@ -10,4 +10,5 @@ rally: - 0.2.5 Add helm hook for jobs - 0.2.6 Added OCI registry authentication - 0.2.7 Support TLS for identity endpoint + - 0.2.8 Bump Cirros version to 0.6.2 ... diff --git a/releasenotes/notes/tempest.yaml b/releasenotes/notes/tempest.yaml index 35e5ccd06a..82f4418ddd 100644 --- a/releasenotes/notes/tempest.yaml +++ b/releasenotes/notes/tempest.yaml @@ -10,4 +10,5 @@ tempest: - 0.2.5 Added OCI registry authentication - 0.2.6 Support SSL openstack endpoints - 0.2.7 Add configuration for heat-tempest-plugin + - 0.2.8 Bump Cirros version to 0.6.2 ... diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml index 406e963ba7..315c28384a 100644 --- a/tempest/Chart.yaml +++ b/tempest/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Tempest name: tempest -version: 0.2.7 +version: 0.2.8 home: https://docs.openstack.org/tempest/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png sources: diff --git a/tempest/values.yaml b/tempest/values.yaml index a903143ccb..742ec5c324 100644 --- a/tempest/values.yaml +++ b/tempest/values.yaml @@ -166,7 +166,7 @@ conf: # this value should be the same as the keystone chart conf.keystone.identity.domain_specific_drivers_enabled domain_specific_drivers: true image: - http_image: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + http_image: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" container_formats: bare disk_formats: raw network: diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh index e3b4507821..51e5489774 100755 --- a/tools/deployment/component/glance/glance.sh +++ b/tools/deployment/component/glance/glance.sh @@ -42,7 +42,7 @@ export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack image list -openstack image show 'Cirros 0.3.5 64-bit' +openstack image show 'Cirros 0.6.2 64-bit' if [ "x${RUN_HELM_TESTS}" == "xno" ]; then exit 0 diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh index ef0221c808..cae2e9f26f 100755 --- a/tools/deployment/developer/ceph/120-glance.sh +++ b/tools/deployment/developer/ceph/120-glance.sh @@ -35,4 +35,4 @@ export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack image list -openstack image show 'Cirros 0.3.5 64-bit' +openstack image show 'Cirros 0.6.2 64-bit' diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh index 3a1ce9814b..d7fd4e7989 100755 --- a/tools/deployment/developer/nfs/120-glance.sh +++ b/tools/deployment/developer/nfs/120-glance.sh @@ -40,4 +40,4 @@ export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack image list -openstack image show 'Cirros 0.3.5 64-bit' +openstack image show 'Cirros 0.6.2 64-bit' diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh index 3c4374e5bf..d60207e809 100755 --- a/tools/deployment/multinode/100-glance.sh +++ b/tools/deployment/multinode/100-glance.sh @@ -45,7 +45,7 @@ export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack image list -openstack image show 'Cirros 0.3.5 64-bit' +openstack image show 'Cirros 0.6.2 64-bit' if [ "x${RUN_HELM_TESTS}" == "xno" ]; then exit 0 diff --git a/tools/gate/files/heat-basic-bm-deployment.yaml b/tools/gate/files/heat-basic-bm-deployment.yaml index f82adf9661..c414726d8b 100644 --- a/tools/gate/files/heat-basic-bm-deployment.yaml +++ b/tools/gate/files/heat-basic-bm-deployment.yaml @@ -11,7 +11,7 @@ parameters: image: type: string - default: Cirros 0.3.5 64-bit + default: Cirros 0.6.2 64-bit flavor: type: string diff --git a/tools/gate/files/heat-basic-vm-deployment.yaml b/tools/gate/files/heat-basic-vm-deployment.yaml index 352cac5596..7b221dee51 100644 --- a/tools/gate/files/heat-basic-vm-deployment.yaml +++ b/tools/gate/files/heat-basic-vm-deployment.yaml @@ -7,7 +7,7 @@ parameters: image: type: string - default: Cirros 0.3.5 64-bit + default: Cirros 0.6.2 64-bit ssh_key: type: string @@ -27,7 +27,7 @@ resources: type: OS::Nova::Flavor properties: disk: 1 - ram: 64 + ram: 128 vcpus: 1 server: