Fix: testing bundles for jammy and lunar were off

Change-Id: I314fef8551e896ab35678bc78f0233cb42030413
This commit is contained in:
Peter Sabaini 2023-05-08 20:40:03 +02:00
parent f23d9e3d3e
commit f172b8cd1e
3 changed files with 37 additions and 33 deletions

View File

@ -1,7 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
openstack-origin: &openstack-origin cloud:jammy-antelope
series: focal
local_overlay_enabled: False
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -110,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -120,7 +122,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: yoga/edge
channel: 2023.1/edge
glance:
expose: True
@ -130,7 +132,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: 2023.1/edge
cinder:
expose: True
@ -142,11 +144,11 @@ applications:
openstack-origin: *openstack-origin
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
@ -156,7 +158,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -165,7 +167,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: 2023.1/edge
prometheus2:
charm: ch:prometheus2

View File

@ -1,7 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
openstack-origin: &openstack-origin cloud:jammy-zed
series: focal
local_overlay_enabled: False
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -110,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: zed/edge
nova-compute:
charm: ch:nova-compute
@ -120,7 +122,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: yoga/edge
channel: zed/edge
glance:
expose: True
@ -130,7 +132,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: zed/edge
cinder:
expose: True
@ -142,11 +144,11 @@ applications:
openstack-origin: *openstack-origin
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
@ -156,7 +158,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: zed/edge
placement:
charm: ch:placement
@ -165,7 +167,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: zed/edge
prometheus2:
charm: ch:prometheus2

View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: jammy
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -34,19 +34,19 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: latest/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: latest/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: latest/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -57,7 +57,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
@ -101,7 +101,7 @@ applications:
source: *openstack-origin
to:
- '9'
channel: 3.9/edge
channel: latest/edge
keystone:
expose: True
@ -111,7 +111,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: yoga/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -121,7 +121,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: yoga/edge
channel: 2023.1/edge
glance:
expose: True
@ -131,7 +131,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: yoga/edge
channel: 2023.1/edge
cinder:
expose: True
@ -143,11 +143,11 @@ applications:
openstack-origin: *openstack-origin
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
@ -157,7 +157,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -166,7 +166,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
channel: 2023.1/edge
prometheus2:
charm: ch:prometheus2