From a1cbb9f15d8101310c33f635019c2fc82ac9a18f Mon Sep 17 00:00:00 2001
From: Peter Sabaini <peter.sabaini@canonical.com>
Date: Wed, 24 Apr 2024 10:12:14 +0200
Subject: [PATCH] Updates for stable/reef

Change-Id: I9da89928e100e5002d36541d8283462651c3e792
---
 ceph-mon/.gitreview                      |  3 ++-
 ceph-mon/charmcraft.yaml                 |  6 ------
 ceph-mon/metadata.yaml                   |  4 +---
 ceph-mon/tests/bundles/jammy-bobcat.yaml | 20 ++++++++++----------
 ceph-mon/tests/tests.yaml                |  1 -
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/ceph-mon/.gitreview b/ceph-mon/.gitreview
index 5c2f5880..d8b32ec7 100644
--- a/ceph-mon/.gitreview
+++ b/ceph-mon/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
 host=review.opendev.org
 port=29418
-project=openstack/charm-ceph-mon.git
\ No newline at end of file
+project=openstack/charm-ceph-mon.git
+defaultbranch=stable/reef
diff --git a/ceph-mon/charmcraft.yaml b/ceph-mon/charmcraft.yaml
index b0562382..a58f4124 100644
--- a/ceph-mon/charmcraft.yaml
+++ b/ceph-mon/charmcraft.yaml
@@ -36,9 +36,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/ceph-mon/metadata.yaml b/ceph-mon/metadata.yaml
index 85e088fb..9a02b26e 100644
--- a/ceph-mon/metadata.yaml
+++ b/ceph-mon/metadata.yaml
@@ -13,8 +13,6 @@ tags:
 series:
 - focal
 - jammy
-- lunar
-- mantic
 peers:
   mon:
     interface: ceph
@@ -50,4 +48,4 @@ resources:
   alert-rules:
     type: file
     filename: alert.yaml.rules
-    description: "Alerting rules"
+    description: Alerting rules
diff --git a/ceph-mon/tests/bundles/jammy-bobcat.yaml b/ceph-mon/tests/bundles/jammy-bobcat.yaml
index 2227b406..b9c1033f 100644
--- a/ceph-mon/tests/bundles/jammy-bobcat.yaml
+++ b/ceph-mon/tests/bundles/jammy-bobcat.yaml
@@ -77,11 +77,11 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
-    channel: latest/edge
+    channel: reef/edge
     num_units: 3
     options:
       source: *openstack-origin
@@ -96,7 +96,7 @@ applications:
     num_units: 1
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: reef/edge
     to: 
     - '17'
 
@@ -108,7 +108,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -118,7 +118,7 @@ applications:
       libvirt-image-backend: rbd
     to:
       - '11'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   glance:
     expose: True
@@ -128,7 +128,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '12'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   cinder:
     expose: True
@@ -140,11 +140,11 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   cinder-ceph:
     charm: ch:cinder-ceph
-    channel: latest/edge
+    channel: 2023.2/edge
 
   nova-cloud-controller:
     expose: True
@@ -154,7 +154,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '14'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   placement:
     charm: ch:placement
@@ -163,7 +163,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '15'
-    channel: latest/edge
+    channel: 2023.2/edge
 
   prometheus2:
     charm: ch:prometheus2
diff --git a/ceph-mon/tests/tests.yaml b/ceph-mon/tests/tests.yaml
index e2aef903..54fee268 100644
--- a/ceph-mon/tests/tests.yaml
+++ b/ceph-mon/tests/tests.yaml
@@ -5,7 +5,6 @@ gate_bundles:
   - focal-yoga
   - jammy-yoga
   - jammy-bobcat
-  - mantic-bobcat
 
 smoke_bundles:
   - focal-yoga