openstack
/
charm-aodh
Code Issues Proposed changes

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: I23a62754654b725fffe8e40714a9aae391e2053c
This commit is contained in:
Alex Kavanagh 2024-02-06 20:07:35 +00:00
parent fa3d9da753
commit beca063bad
9 changed files with 41 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charmcraft.yaml
View File

@ -4,6 +4,8 @@ parts:
charm:
source: src/
plugin: reactive
reactive-charm-build-arguments:
- --verbose
build-packages:
- libpython3-dev
build-snaps:
@ -22,9 +24,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]

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: aodh
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/stable

6
src/metadata.yaml
View File

@ -12,11 +12,9 @@ description: |
Aodh provides the Alarming service as part of OpenStack telemetry.
docs: https://discourse.charmhub.io/t/aodh-docs-index/11004
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
mongodb:

20
src/tests/bundles/jammy-antelope.yaml
View File

@ -32,13 +32,13 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
aodh-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
gnocchi-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -49,7 +49,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
aodh:
charm: ../../../aodh.charm
@ -64,7 +64,7 @@ applications:
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
keystone:
charm: ch:keystone
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,7 +114,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached

20
src/tests/bundles/jammy-bobcat.yaml
View File

@ -32,13 +32,13 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
aodh-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
gnocchi-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -49,7 +49,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
aodh:
charm: ../../../aodh.charm
@ -64,7 +64,7 @@ applications:
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
keystone:
charm: ch:keystone
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,7 +114,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached

26
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,9 +1,9 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
series: lunar
series: jammy
machines:
0:
@ -32,13 +32,13 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
aodh-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
gnocchi-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -49,7 +49,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
aodh:
charm: ../../../aodh.charm
@ -64,7 +64,7 @@ applications:
num_units: 1
to:
- '4'
channel: latest/edge
channel: 3.9/edge
keystone:
charm: ch:keystone
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,12 +114,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached
num_units: 1
# Note that holding memcached at focal as it's not available at lunar yet.
# Note that holding memcached at focal as it's not available at jammy yet.
series: focal
to:
- '14'

180
src/tests/bundles/mantic-bobcat.yaml
View File

@ -1,180 +0,0 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: mantic
machines:
0:
constraints: "mem=3072M"
1:
constraints: "mem=3072M"
2:
constraints: "mem=3072M"
3:
4:
5:
6:
7:
8:
9:
10:
11:
12:
13:
14:
series: focal
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "7"
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
aodh-mysql-router:
charm: ch:mysql-router
channel: latest/edge
gnocchi-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
aodh:
charm: ../../../aodh.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
ceilometer:
charm: ch:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
to:
- '7'
- '8'
- '9'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
expected-osd-count: 3
monitor-count: '3'
to:
- '10'
- '11'
- '12'
channel: latest/edge
gnocchi:
charm: ch:gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
memcached:
charm: ch:memcached
num_units: 1
# Note that holding memcached at focal as it's not available at mantic yet.
series: focal
to:
- '14'
nrpe:
charm: ch:nrpe
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'aodh:shared-db'
- 'aodh-mysql-router:shared-db'
- - 'aodh-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'aodh:amqp'
- 'rabbitmq-server:amqp'
- - 'aodh:identity-service'
- 'keystone:identity-service'
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'aodh:nrpe-external-master'
- 'nrpe:nrpe-external-master'

4
src/tests/tests.yaml
View File

@ -4,8 +4,6 @@ gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
smoke_bundles:
- jammy-yoga
tests:
@ -28,5 +26,3 @@ tests_options:
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat

3
src/wheelhouse.txt
View File

@ -1,3 +1,6 @@
calver
hatchling
psutil
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack