From 2fd438b4b130e0c4010218c7b1c846e5643a35ec Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Tue, 12 Mar 2024 11:14:12 -0600 Subject: [PATCH] Update Ceph images to patched 18.2.2 and restore debian-reef repo This change updates the Ceph images to 18.2.2 images patched with a fix for https://tracker.ceph.com/issues/63684. It also reverts the package repository in the deployment scripts to use the debian-reef directory on download.ceph.com instead of debian-18.2.1. The issue with the repo that prompted the previous change to debian-18.2.1 has been resolved and the more generic debian-reef directory may now be used again. Change-Id: I85be0cfa73f752019fc3689887dbfd36cec3f6b2 --- ceph-adapter-rook/Chart.yaml | 2 +- ceph-adapter-rook/values.yaml | 2 +- ceph-client/Chart.yaml | 2 +- ceph-client/values.yaml | 8 ++++---- ceph-mon/Chart.yaml | 2 +- ceph-mon/values.yaml | 10 +++++----- ceph-osd/Chart.yaml | 2 +- ceph-osd/values.yaml | 6 +++--- ceph-provisioners/Chart.yaml | 2 +- ceph-provisioners/values.yaml | 6 +++--- ceph-rgw/Chart.yaml | 2 +- ceph-rgw/values.yaml | 12 ++++++------ elasticsearch/Chart.yaml | 2 +- elasticsearch/values.yaml | 8 ++++---- gnocchi/Chart.yaml | 2 +- gnocchi/values.yaml | 2 +- libvirt/Chart.yaml | 2 +- libvirt/values.yaml | 2 +- releasenotes/notes/ceph-adapter-rook.yaml | 1 + releasenotes/notes/ceph-client.yaml | 1 + releasenotes/notes/ceph-mon.yaml | 1 + releasenotes/notes/ceph-osd.yaml | 1 + releasenotes/notes/ceph-provisioners.yaml | 1 + releasenotes/notes/ceph-rgw.yaml | 1 + releasenotes/notes/elasticsearch.yaml | 1 + releasenotes/notes/gnocchi.yaml | 1 + releasenotes/notes/libvirt.yaml | 1 + roles/deploy-env/tasks/prerequisites.yaml | 2 +- tools/gate/deploy-k8s.sh | 2 +- 29 files changed, 48 insertions(+), 39 deletions(-) diff --git a/ceph-adapter-rook/Chart.yaml b/ceph-adapter-rook/Chart.yaml index 051a2fd91..2df80a44a 100644 --- a/ceph-adapter-rook/Chart.yaml +++ b/ceph-adapter-rook/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Adapter Rook name: ceph-adapter-rook -version: 0.1.1 +version: 0.1.2 home: https://github.com/ceph/ceph ... diff --git a/ceph-adapter-rook/values.yaml b/ceph-adapter-rook/values.yaml index 3cab0de99..d39276828 100644 --- a/ceph-adapter-rook/values.yaml +++ b/ceph-adapter-rook/values.yaml @@ -2,7 +2,7 @@ images: pull_policy: IfNotPresent tags: - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' local_registry: diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml index 07348e001..4bfcae871 100644 --- a/ceph-client/Chart.yaml +++ b/ceph-client/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Client name: ceph-client -version: 0.1.49 +version: 0.1.50 home: https://github.com/ceph/ceph-client ... diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 939fffedd..712d8ec17 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -24,10 +24,10 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' - ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' + ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' local_registry: diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml index 116d6d704..fb7c7a28c 100644 --- a/ceph-mon/Chart.yaml +++ b/ceph-mon/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Mon name: ceph-mon -version: 0.1.33 +version: 0.1.34 home: https://github.com/ceph/ceph ... diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index a900df80b..225f43e06 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -23,11 +23,11 @@ deployment: images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' - ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' + ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' local_registry: diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml index 591442246..d0ab5b62e 100644 --- a/ceph-osd/Chart.yaml +++ b/ceph-osd/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph OSD name: ceph-osd -version: 0.1.50 +version: 0.1.51 home: https://github.com/ceph/ceph ... diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 144cc6c25..33da8f5e6 100644 --- a/ceph-osd/values.yaml +++ b/ceph-osd/values.yaml @@ -19,9 +19,9 @@ images: pull_policy: IfNotPresent tags: - ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' local_registry: diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml index 5c5162f1d..97c4b5b94 100644 --- a/ceph-provisioners/Chart.yaml +++ b/ceph-provisioners/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Provisioner name: ceph-provisioners -version: 0.1.28 +version: 0.1.29 home: https://github.com/ceph/ceph ... diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 74d243720..b1faeac55 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -29,9 +29,9 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_jammy_18.2.1-1-20240130' - ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_jammy_18.2.1-1-20240130' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_jammy_18.2.2-1-20240312' + ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_jammy_18.2.2-1-20240312' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:change_770201_ubuntu_bionic-20210113' csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0' csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0' diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml index 03b0f38e9..45aec1259 100644 --- a/ceph-rgw/Chart.yaml +++ b/ceph-rgw/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph RadosGW name: ceph-rgw -version: 0.1.33 +version: 0.1.34 home: https://github.com/ceph/ceph ... diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 28dd93d2b..c29bc8cb6 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -24,14 +24,14 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' - ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130' - ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' + ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' + ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' - rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' - rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' + rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' ks_endpoints: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' ks_service: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' ks_user: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index c22934ed9..6f6e9a84c 100644 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v8.9.0 description: OpenStack-Helm ElasticSearch name: elasticsearch -version: 0.3.1 +version: 0.3.2 home: https://www.elastic.co/ sources: - https://github.com/elastic/elasticsearch diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 34adbcf83..07a21c090 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -21,13 +21,13 @@ images: memory_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0 curator: docker.io/untergeek/curator:8.0.8 - ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130 - s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.1-1-20240130 - s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130 + ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 + s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312 + s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.7.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130 + snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0 image_repo_sync: docker.io/library/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/gnocchi/Chart.yaml b/gnocchi/Chart.yaml index 8706c2650..012b64a67 100644 --- a/gnocchi/Chart.yaml +++ b/gnocchi/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v3.0.3 description: OpenStack-Helm Gnocchi name: gnocchi -version: 0.1.13 +version: 0.1.14 home: https://gnocchi.xyz/ icon: https://gnocchi.xyz/_static/gnocchi-logo.png sources: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 44e07e133..5756752c5 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -37,7 +37,7 @@ release_group: null images: tags: dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130 + gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 db_init_indexer: docker.io/library/postgres:9.5 # using non-kolla images until kolla supports postgres as # an indexer diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml index d538fff40..c4a2f92ba 100644 --- a/libvirt/Chart.yaml +++ b/libvirt/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm libvirt name: libvirt -version: 0.1.28 +version: 0.1.29 home: https://libvirt.org sources: - https://libvirt.org/git/?p=libvirt.git;a=summary diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 204f8c171..ca5980903 100644 --- a/libvirt/values.yaml +++ b/libvirt/values.yaml @@ -28,7 +28,7 @@ images: tags: libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal libvirt_exporter: vexxhost/libvirtd-exporter:latest - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.1-1-20240130' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/library/docker:17.07.0 kubectl: docker.io/bitnami/kubectl:latest diff --git a/releasenotes/notes/ceph-adapter-rook.yaml b/releasenotes/notes/ceph-adapter-rook.yaml index 3bbd862c0..4b4f7327c 100644 --- a/releasenotes/notes/ceph-adapter-rook.yaml +++ b/releasenotes/notes/ceph-adapter-rook.yaml @@ -2,4 +2,5 @@ ceph-adapter-rook: - 0.1.0 Initial Chart - 0.1.1 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.2 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml index 9867c7bdb..7686e7ada 100644 --- a/releasenotes/notes/ceph-client.yaml +++ b/releasenotes/notes/ceph-client.yaml @@ -50,4 +50,5 @@ ceph-client: - 0.1.47 Use Helm toolkit functions for Ceph probes - 0.1.48 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.49 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.50 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml index e1db2968b..145b2eea1 100644 --- a/releasenotes/notes/ceph-mon.yaml +++ b/releasenotes/notes/ceph-mon.yaml @@ -34,4 +34,5 @@ ceph-mon: - 0.1.31 Add Rook Helm charts for managing Ceph with Rook - 0.1.32 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.33 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.34 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/ceph-osd.yaml b/releasenotes/notes/ceph-osd.yaml index d04605d72..4672360d2 100644 --- a/releasenotes/notes/ceph-osd.yaml +++ b/releasenotes/notes/ceph-osd.yaml @@ -51,4 +51,5 @@ ceph-osd: - 0.1.48 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.49 Update Ceph images to Jammy and Reef 18.2.1 - 0.1.50 Allow lvcreate to wipe existing LV metadata + - 0.1.51 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml index e23a2ae3f..015ec9c00 100644 --- a/releasenotes/notes/ceph-provisioners.yaml +++ b/releasenotes/notes/ceph-provisioners.yaml @@ -28,4 +28,5 @@ ceph-provisioners: - 0.1.26 Update Ceph to 17.2.6 - 0.1.27 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.28 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.29 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml index a7f33aba6..2f06ce7c2 100644 --- a/releasenotes/notes/ceph-rgw.yaml +++ b/releasenotes/notes/ceph-rgw.yaml @@ -34,4 +34,5 @@ ceph-rgw: - 0.1.31 Add a ceph-rgw-pool job to manage RGW pools - 0.1.32 Multiple namespace support for the ceph-rgw-pool job - 0.1.33 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.34 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index e268456fa..3ecb47caf 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/releasenotes/notes/elasticsearch.yaml @@ -42,4 +42,5 @@ elasticsearch: - 0.2.30 Update curator for es v8 - 0.3.0 Update elasticsearch_exporter to v1.7.0 - 0.3.1 Update Ceph images to Jammy and Reef 18.2.1 + - 0.3.2 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/gnocchi.yaml b/releasenotes/notes/gnocchi.yaml index be2aa9f71..02281660a 100644 --- a/releasenotes/notes/gnocchi.yaml +++ b/releasenotes/notes/gnocchi.yaml @@ -14,4 +14,5 @@ gnocchi: - 0.1.11 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.12 Update Ceph images to Jammy and Reef 18.2.1 - 0.1.13 Bugfix Ceph user creation for RBD access + - 0.1.14 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/releasenotes/notes/libvirt.yaml b/releasenotes/notes/libvirt.yaml index 79b3b6615..01f1c6fac 100644 --- a/releasenotes/notes/libvirt.yaml +++ b/releasenotes/notes/libvirt.yaml @@ -29,4 +29,5 @@ libvirt: - 0.1.26 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.27 Add watch verb to vencrypt cert-manager Role - 0.1.28 Update Ceph images to Jammy and Reef 18.2.1 + - 0.1.29 Update Ceph images to patched 18.2.2 and restore debian-reef repo ... diff --git a/roles/deploy-env/tasks/prerequisites.yaml b/roles/deploy-env/tasks/prerequisites.yaml index 496ee32ef..62f5c6d63 100644 --- a/roles/deploy-env/tasks/prerequisites.yaml +++ b/roles/deploy-env/tasks/prerequisites.yaml @@ -18,7 +18,7 @@ - name: Add Ceph apt repository apt_repository: - repo: deb https://download.ceph.com/debian-18.2.1/ "{{ ansible_distribution_release }}" main + repo: deb https://download.ceph.com/debian-reef/ "{{ ansible_distribution_release }}" main state: present filename: ceph.list diff --git a/tools/gate/deploy-k8s.sh b/tools/gate/deploy-k8s.sh index 48fb4e8a3..4fc4d5e1c 100755 --- a/tools/gate/deploy-k8s.sh +++ b/tools/gate/deploy-k8s.sh @@ -135,7 +135,7 @@ fi # Install required packages for K8s on host wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add - RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}') -sudo add-apt-repository "deb https://download.ceph.com/debian-18.2.1/ +sudo add-apt-repository "deb https://download.ceph.com/debian-reef/ ${RELEASE_NAME} main" sudo -E apt-get update