Add 2023.2 Bobcat support

* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* add mantic to metadata series
* align testing with bobcat
* add new bobcat bundles
* add bobcat bundles to tests.yaml
* add bobcat tests to osci.yaml
* update build-on and run-on bases
* drop kinetic
* update charmcraft_channel to 2.x/stable

Change-Id: I0e6d413bd063a5aa423aed59329c9674b314ce59
This commit is contained in:
Corey Bryant 2023-07-18 16:47:18 -04:00
parent 1ec214235e
commit 72b77808ad
6 changed files with 119 additions and 9 deletions

View File

@ -22,9 +22,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]

View File

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

View File

@ -8,8 +8,8 @@ tags:
- openstack
series:
- jammy
- kinetic
- lunar
- mantic
subordinate: true
requires:
dashboard:

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

View File

@ -0,0 +1,108 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: mantic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
manila-mysql-router:
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
manila:
charm: ch:manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
manila-dashboard:
charm: ../../../manila-dashboard.charm
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

View File

@ -1,14 +1,15 @@
charm_name: manila-dashboard
smoke_bundles:
- jammy-zed
- jammy-antelope
gate_bundles:
- jammy-zed
- jammy-antelope
dev_bundles:
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
target_deploy_status:
manila:
@ -24,3 +25,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat