openstack
/
charm-ceph-mon
Code Issues Proposed changes

Merge "Add 2023.2 Bobcat support"

This commit is contained in:
Zuul 2023-08-04 15:12:34 +00:00 committed by Gerrit Code Review
parent 3eb5898a65 49e21b83a3
commit 61c8209e3d
6 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

@ -36,9 +36,9 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.10"
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]

3
metadata.yaml
View File

@ -13,7 +13,8 @@ tags:
series:
- focal
- jammy
- kinetic
- lunar
- mantic
peers:
mon:
interface: ceph

3
osci.yaml
View File

@ -3,13 +3,12 @@
- charm-unit-jobs-py38
- charm-unit-jobs-py310
- charm-yoga-functional-jobs
- charm-zed-functional-jobs
- charm-functional-jobs
vars:
needs_charm_build: true
charm_build_name: ceph-mon
build_type: charmcraft
charmcraft_channel: 2.0/stable
charmcraft_channel: 2.x/stable
check:
jobs:
- new-install-focal-yoga

30
tests/bundles/jammy-zed.yaml → tests/bundles/jammy-bobcat.yaml
View File

@ -1,5 +1,5 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-zed
openstack-origin: &openstack-origin cloud:jammy-bobcat
local_overlay_enabled: False
@ -58,6 +58,13 @@ applications:
- '2'
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: 3.9/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -93,13 +100,6 @@ applications:
to:
- '17'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: 3.9/edge
keystone:
expose: True
charm: ch:keystone
@ -108,7 +108,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: zed/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -118,7 +118,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: zed/edge
channel: 2023.1/edge
glance:
expose: True
@ -128,7 +128,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: zed/edge
channel: 2023.1/edge
cinder:
expose: True
@ -140,11 +140,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: zed/edge
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: zed/edge
channel: 2023.1/edge
nova-cloud-controller:
expose: True
@ -154,7 +154,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: zed/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -163,7 +163,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: zed/edge
channel: 2023.1/edge
prometheus2:
charm: ch:prometheus2

74
tests/bundles/kinetic-zed.yaml → tests/bundles/mantic-bobcat.yaml
View File

@ -1,18 +1,24 @@
variables:
openstack-origin: &openstack-origin distro
# use infra (mysql, rabbit) from lts for stability
infra-series: &infra-series jammy
series: jammy
series: mantic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: *infra-series
'1':
constraints: mem=3072M
series: *infra-series
'2':
constraints: mem=3072M
series: *infra-series
'3':
series: *infra-series
'4':
'5':
'6':
@ -26,38 +32,43 @@ machines:
'14':
'15':
'16':
series: focal
'17':
series: focal
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.9/edge
ceph-osd:
charm: ch:ceph-osd
@ -68,9 +79,9 @@ applications:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '3'
- '4'
- '5'
- '6'
channel: quincy/edge
ceph-mon:
@ -81,9 +92,9 @@ applications:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: ch:ceph-fs
@ -92,16 +103,7 @@ applications:
source: *openstack-origin
channel: quincy/edge
to:
- '17'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: 3.9/edge
- '10'
keystone:
expose: True
@ -110,8 +112,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
- '11'
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -120,8 +122,8 @@ applications:
openstack-origin: *openstack-origin
libvirt-image-backend: rbd
to:
- '11'
channel: yoga/edge
- '12'
channel: 2023.1/edge
glance:
expose: True
@ -130,8 +132,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
- '13'
channel: 2023.1/edge
cinder:
expose: True
@ -142,12 +144,12 @@ applications:
glance-api-version: '2'
openstack-origin: *openstack-origin
to:
- '13'
channel: yoga/edge
- '14'
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: yoga/edge
channel: 2023.1/edge
nova-cloud-controller:
expose: True
@ -156,8 +158,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
- '15'
channel: 2023.1/edge
placement:
charm: ch:placement
@ -165,15 +167,15 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
- '16'
channel: 2023.1/edge
prometheus2:
charm: ch:prometheus2
num_units: 1
series: focal
to:
- '16'
- '17'
relations:
- - 'nova-compute:amqp'

2
tests/tests.yaml
View File

@ -4,6 +4,8 @@ gate_bundles:
- focal-xena
- focal-yoga
- jammy-yoga
- jammy-bobcat
- mantic-bobcat
smoke_bundles:
- focal-yoga