From ef049413fdea19035e3aa65d5fccb0351382f336 Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Tue, 30 Jan 2024 07:40:14 -0700 Subject: [PATCH] [ceph] Update Ceph images to Jammy and Reef 18.2.1 This change updates all Ceph images for Jammy-based deployments in openstack-helm to latest-ubuntu_jammy. Change-Id: Id80f0fc074da01548006fc37c2629b27fbddbd25 --- cinder/Chart.yaml | 2 +- cinder/values.yaml | 4 ++-- cinder/values_overrides/2023.1-ubuntu_jammy.yaml | 4 ++-- cinder/values_overrides/2023.2-ubuntu_jammy.yaml | 4 ++-- cinder/values_overrides/zed-ubuntu_jammy.yaml | 4 ++-- glance/Chart.yaml | 2 +- glance/values_overrides/2023.1-ubuntu_jammy.yaml | 2 +- glance/values_overrides/2023.2-ubuntu_jammy.yaml | 2 +- glance/values_overrides/zed-ubuntu_jammy.yaml | 2 +- nova/Chart.yaml | 2 +- nova/values.yaml | 4 ++-- nova/values_overrides/2023.1-ubuntu_jammy.yaml | 2 +- nova/values_overrides/2023.2-ubuntu_jammy.yaml | 2 +- nova/values_overrides/zed-ubuntu_jammy.yaml | 2 +- openstack/Chart.yaml | 2 +- openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml | 2 +- openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml | 2 +- openstack/values_overrides/glance/zed-ubuntu_jammy.yaml | 2 +- openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml | 2 +- openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml | 2 +- openstack/values_overrides/nova/zed-ubuntu_jammy.yaml | 2 +- releasenotes/notes/cinder.yaml | 1 + releasenotes/notes/glance.yaml | 1 + releasenotes/notes/nova.yaml | 1 + releasenotes/notes/openstack.yaml | 1 + 25 files changed, 30 insertions(+), 26 deletions(-) diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index b11df3512c..47b118193d 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.3.15 +version: 0.3.16 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/values.yaml b/cinder/values.yaml index 28c2dc6a51..c13a9114f1 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -55,9 +55,9 @@ images: cinder_scheduler: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal cinder_volume: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal cinder_volume_usage_audit: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal - cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal + cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy cinder_backup: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal - cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal + cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/cinder/values_overrides/2023.1-ubuntu_jammy.yaml b/cinder/values_overrides/2023.1-ubuntu_jammy.yaml index 834e64b620..10764ec4f7 100644 --- a/cinder/values_overrides/2023.1-ubuntu_jammy.yaml +++ b/cinder/values_overrides/2023.1-ubuntu_jammy.yaml @@ -12,7 +12,7 @@ images: cinder_scheduler: "docker.io/openstackhelm/cinder:2023.1-ubuntu_jammy" cinder_volume: "docker.io/openstackhelm/cinder:2023.1-ubuntu_jammy" cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:2023.1-ubuntu_jammy" - cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" cinder_backup: "docker.io/openstackhelm/cinder:2023.1-ubuntu_jammy" - cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/cinder/values_overrides/2023.2-ubuntu_jammy.yaml b/cinder/values_overrides/2023.2-ubuntu_jammy.yaml index cc7fcf16e6..ab896bed5f 100644 --- a/cinder/values_overrides/2023.2-ubuntu_jammy.yaml +++ b/cinder/values_overrides/2023.2-ubuntu_jammy.yaml @@ -12,7 +12,7 @@ images: cinder_scheduler: "docker.io/openstackhelm/cinder:2023.2-ubuntu_jammy" cinder_volume: "docker.io/openstackhelm/cinder:2023.2-ubuntu_jammy" cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:2023.2-ubuntu_jammy" - cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" cinder_backup: "docker.io/openstackhelm/cinder:2023.2-ubuntu_jammy" - cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/cinder/values_overrides/zed-ubuntu_jammy.yaml b/cinder/values_overrides/zed-ubuntu_jammy.yaml index f7a4ac7cbc..3c2a78f6fa 100644 --- a/cinder/values_overrides/zed-ubuntu_jammy.yaml +++ b/cinder/values_overrides/zed-ubuntu_jammy.yaml @@ -12,7 +12,7 @@ images: cinder_scheduler: "docker.io/openstackhelm/cinder:zed-ubuntu_jammy" cinder_volume: "docker.io/openstackhelm/cinder:zed-ubuntu_jammy" cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:zed-ubuntu_jammy" - cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" cinder_backup: "docker.io/openstackhelm/cinder:zed-ubuntu_jammy" - cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/glance/Chart.yaml b/glance/Chart.yaml index 4c2c87f46c..d785a1ebab 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.16 +version: 0.4.17 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_overrides/2023.1-ubuntu_jammy.yaml b/glance/values_overrides/2023.1-ubuntu_jammy.yaml index b8ef79f8d6..644ef09aeb 100644 --- a/glance/values_overrides/2023.1-ubuntu_jammy.yaml +++ b/glance/values_overrides/2023.1-ubuntu_jammy.yaml @@ -10,5 +10,5 @@ images: glance_db_sync: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/glance/values_overrides/2023.2-ubuntu_jammy.yaml b/glance/values_overrides/2023.2-ubuntu_jammy.yaml index e45bafd84c..4cc6b67737 100644 --- a/glance/values_overrides/2023.2-ubuntu_jammy.yaml +++ b/glance/values_overrides/2023.2-ubuntu_jammy.yaml @@ -10,5 +10,5 @@ images: glance_db_sync: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/glance/values_overrides/zed-ubuntu_jammy.yaml b/glance/values_overrides/zed-ubuntu_jammy.yaml index da1b8217cf..8b46d2251d 100644 --- a/glance/values_overrides/zed-ubuntu_jammy.yaml +++ b/glance/values_overrides/zed-ubuntu_jammy.yaml @@ -10,5 +10,5 @@ images: glance_db_sync: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/nova/Chart.yaml b/nova/Chart.yaml index 90afa01b8d..cccbf4ff78 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.3.35 +version: 0.3.36 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/values.yaml b/nova/values.yaml index bc34440d94..f5ac9fa465 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -74,10 +74,10 @@ images: nova_novncproxy: docker.io/openstackhelm/nova:wallaby-ubuntu_focal nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:wallaby' nova_scheduler: docker.io/openstackhelm/nova:wallaby-ubuntu_focal - nova_storage_init: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal' + nova_storage_init: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy' # NOTE(portdirect): we simply use the ceph config helper here, # as it has both oscli and jq. - nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal' + nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy' nova_spiceproxy: docker.io/openstackhelm/nova:wallaby-ubuntu_focal nova_spiceproxy_assets: docker.io/openstackhelm/nova:wallaby-ubuntu_focal test: docker.io/xrally/xrally-openstack:2.0.0 diff --git a/nova/values_overrides/2023.1-ubuntu_jammy.yaml b/nova/values_overrides/2023.1-ubuntu_jammy.yaml index db8cc6a550..8cfc634735 100644 --- a/nova/values_overrides/2023.1-ubuntu_jammy.yaml +++ b/nova/values_overrides/2023.1-ubuntu_jammy.yaml @@ -19,5 +19,5 @@ images: nova_scheduler: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/nova/values_overrides/2023.2-ubuntu_jammy.yaml b/nova/values_overrides/2023.2-ubuntu_jammy.yaml index 89929f724c..4a3266152a 100644 --- a/nova/values_overrides/2023.2-ubuntu_jammy.yaml +++ b/nova/values_overrides/2023.2-ubuntu_jammy.yaml @@ -19,5 +19,5 @@ images: nova_scheduler: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/nova/values_overrides/zed-ubuntu_jammy.yaml b/nova/values_overrides/zed-ubuntu_jammy.yaml index 919b9f985c..0d1bdd9d18 100644 --- a/nova/values_overrides/zed-ubuntu_jammy.yaml +++ b/nova/values_overrides/zed-ubuntu_jammy.yaml @@ -19,5 +19,5 @@ images: nova_scheduler: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml index a05413f42b..50b5cd6a79 100644 --- a/openstack/Chart.yaml +++ b/openstack/Chart.yaml @@ -57,6 +57,6 @@ dependencies: description: A chart for openstack helm commmon deployment items name: openstack type: application -version: 0.2.6 +version: 0.2.7 maintainers: - name: OpenStack-Helm Authors diff --git a/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml index ff1e8812d0..47e363051d 100644 --- a/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml +++ b/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml @@ -11,5 +11,5 @@ glance: glance_db_sync: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml b/openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml index c73a72bf45..2de66fedd4 100644 --- a/openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml +++ b/openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml @@ -11,5 +11,5 @@ glance: glance_db_sync: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:2023.2-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/values_overrides/glance/zed-ubuntu_jammy.yaml b/openstack/values_overrides/glance/zed-ubuntu_jammy.yaml index 50bf8be342..f36e952d50 100644 --- a/openstack/values_overrides/glance/zed-ubuntu_jammy.yaml +++ b/openstack/values_overrides/glance/zed-ubuntu_jammy.yaml @@ -11,5 +11,5 @@ glance: glance_db_sync: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" glance_api: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" glance_metadefs_load: "docker.io/openstackhelm/glance:zed-ubuntu_jammy" - glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml index 03da59e75e..e13fd4962d 100644 --- a/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml +++ b/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml @@ -20,5 +20,5 @@ nova: nova_scheduler: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml b/openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml index ef1355db23..3c1852efd6 100644 --- a/openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml +++ b/openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml @@ -20,5 +20,5 @@ nova: nova_scheduler: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.2-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/openstack/values_overrides/nova/zed-ubuntu_jammy.yaml b/openstack/values_overrides/nova/zed-ubuntu_jammy.yaml index 237a7213b9..f52306a6ad 100644 --- a/openstack/values_overrides/nova/zed-ubuntu_jammy.yaml +++ b/openstack/values_overrides/nova/zed-ubuntu_jammy.yaml @@ -20,5 +20,5 @@ nova: nova_scheduler: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" nova_spiceproxy: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:zed-ubuntu_jammy" - nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" ... diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml index acdda14dcf..d3624eb830 100644 --- a/releasenotes/notes/cinder.yaml +++ b/releasenotes/notes/cinder.yaml @@ -65,4 +65,5 @@ cinder: - 0.3.13 Use service tokens - 0.3.14 Add Ubuntu Jammy overrides - 0.3.15 Add 2023.2 Ubuntu Jammy overrides + - 0.3.16 Update Ceph images to Jammy and Reef 18.2.1 ... diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index ccaaab03f1..f8f8c28d14 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -50,4 +50,5 @@ glance: - 0.4.14 Bump Cirros version to 0.6.2 - 0.4.15 Add 2023.2 Ubuntu Jammy overrides - 0.4.16 Use --region option to prevent OS_SWIFT_ENDPOINT_PREFIX is broken in storage-init.sh + - 0.4.17 Update Ceph images to Jammy and Reef 18.2.1 ... diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml index 0fc0580281..61123bfda0 100644 --- a/releasenotes/notes/nova.yaml +++ b/releasenotes/notes/nova.yaml @@ -104,4 +104,5 @@ nova: - 0.3.33 Add job to create 'vms' pool - 0.3.34 Add public endpoints for the spiceproxy - 0.3.35 Use directory mount for vencrypt certificates + - 0.3.36 Update Ceph images to Jammy and Reef 18.2.1 ... diff --git a/releasenotes/notes/openstack.yaml b/releasenotes/notes/openstack.yaml index b649d96eaf..5c3c55f814 100644 --- a/releasenotes/notes/openstack.yaml +++ b/releasenotes/notes/openstack.yaml @@ -15,4 +15,5 @@ openstack: - 0.2.4 Add 2023.1 overrides for Ubuntu Focal and Jammy - 0.2.5 Add 2023.2 Ubuntu Jammy overrides - 0.2.6 Update libvirt overrides for 2023.1 and 2023.2 + - 0.2.7 Update Ceph images to Jammy and Reef 18.2.1 ...