Skip to content

Commit

Permalink
Updates for stable/reef
Browse files Browse the repository at this point in the history
Change-Id: I9da89928e100e5002d36541d8283462651c3e792
  • Loading branch information
sabaini committed Apr 24, 2024
1 parent fd07bb3 commit a1cbb9f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 21 deletions.
3 changes: 2 additions & 1 deletion ceph-mon/.gitreview
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[gerrit]
host=review.opendev.org
port=29418
project=openstack/charm-ceph-mon.git
project=openstack/charm-ceph-mon.git
defaultbranch=stable/reef
6 changes: 0 additions & 6 deletions ceph-mon/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 1 addition & 3 deletions ceph-mon/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ tags:
series:
- focal
- jammy
- lunar
- mantic
peers:
mon:
interface: ceph
Expand Down Expand Up @@ -50,4 +48,4 @@ resources:
alert-rules:
type: file
filename: alert.yaml.rules
description: "Alerting rules"
description: Alerting rules
20 changes: 10 additions & 10 deletions ceph-mon/tests/bundles/jammy-bobcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -96,7 +96,7 @@ applications:
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
channel: reef/edge
to:
- '17'

Expand All @@ -108,7 +108,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.2/edge

nova-compute:
charm: ch:nova-compute
Expand All @@ -118,7 +118,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: latest/edge
channel: 2023.2/edge

glance:
expose: True
Expand All @@ -128,7 +128,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: latest/edge
channel: 2023.2/edge

cinder:
expose: True
Expand All @@ -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
Expand All @@ -154,7 +154,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2023.2/edge

placement:
charm: ch:placement
Expand All @@ -163,7 +163,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.2/edge

prometheus2:
charm: ch:prometheus2
Expand Down
1 change: 0 additions & 1 deletion ceph-mon/tests/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ gate_bundles:
- focal-yoga
- jammy-yoga
- jammy-bobcat
- mantic-bobcat

smoke_bundles:
- focal-yoga
Expand Down

0 comments on commit a1cbb9f

Please sign in to comment.