openstack
/
charm-ceph-osd
Code Issues Proposed changes

Fix: test bundles for jammy and lunar 

Series and UCA pockets were off. Also deploy supporting charms for
lunar on jammy for stability

Change-Id: I805b28bf625d69626fcf663530ac93073d298732
This commit is contained in:
Peter Sabaini 2023-07-24 17:24:24 +02:00
parent f1cdc830dc
commit 6a0b48e916
3 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/bundles/jammy-antelope.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
openstack-origin: &openstack-origin cloud:jammy-antelope
series: focal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -30,30 +30,28 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/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: latest/edge
channel: 8.0/edge
ceph-osd:
charm: ../../ceph-osd.charm
@ -84,11 +82,9 @@ applications:
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 3.9/edge
keystone:
expose: True
@ -98,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -107,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: yoga/edge
channel: 2023.1/edge
glance:
expose: True
@ -117,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: 2023.1/edge
cinder:
expose: True
@ -129,11 +125,11 @@ applications:
glance-api-version: '2'
to:
- '13'
channel: yoga/edge
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: yoga/edge
channel: 2023.1/edge
nova-cloud-controller:
expose: True
@ -143,7 +139,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -152,7 +148,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: 2023.1/edge
relations:
- - 'nova-compute:amqp'

36
tests/bundles/jammy-zed.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
openstack-origin: &openstack-origin cloud:jammy-zed
series: focal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -30,30 +30,28 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/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: latest/edge
channel: 8.0/edge
ceph-osd:
charm: ../../ceph-osd.charm
@ -84,11 +82,9 @@ applications:
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 3.9/edge
keystone:
expose: True
@ -98,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: zed/edge
nova-compute:
charm: ch:nova-compute
@ -107,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: yoga/edge
channel: zed/edge
glance:
expose: True
@ -117,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: zed/edge
cinder:
expose: True
@ -129,11 +125,11 @@ applications:
glance-api-version: '2'
to:
- '13'
channel: yoga/edge
channel: zed/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: yoga/edge
channel: zed/edge
nova-cloud-controller:
expose: True
@ -143,7 +139,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: zed/edge
placement:
charm: ch:placement
@ -152,7 +148,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: zed/edge
relations:
- - 'nova-compute:amqp'

46
tests/bundles/lunar-antelope.yaml
View File

@ -1,17 +1,22 @@
variables:
openstack-origin: &openstack-origin distro
# use infra (mysql, rabbit) from lts for stability
infra-series: &infra-series jammy
series: jammy
series: lunar
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':
'4':
'5':
@ -19,41 +24,46 @@ machines:
'7':
'8':
'9':
series: *infra-series
'10':
series: *infra-series
'11':
series: *infra-series
'12':
series: *infra-series
'13':
series: *infra-series
'14':
series: *infra-series
'15':
series: *infra-series
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/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: latest/edge
channel: 8.0/edge
ceph-osd:
charm: ../../ceph-osd.charm
@ -84,11 +94,9 @@ applications:
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 3.9/edge
keystone:
expose: True
@ -98,7 +106,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -107,7 +115,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: yoga/edge
channel: 2023.1/edge
glance:
expose: True
@ -117,7 +125,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: 2023.1/edge
cinder:
expose: True
@ -129,11 +137,11 @@ applications:
glance-api-version: '2'
to:
- '13'
channel: yoga/edge
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: yoga/edge
channel: 2023.1/edge
nova-cloud-controller:
expose: True
@ -143,7 +151,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -152,7 +160,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: 2023.1/edge
relations:
- - 'nova-compute:amqp'