openstack
/
charm-octavia-dashboard
Code Issues Proposed changes

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/edge

Change-Id: I05522c65c5c147f0ca219717e5a396a09eba7c09
This commit is contained in:
Corey Bryant 2023-07-18 16:47:19 -04:00
parent 8287e5a0c5
commit e9fdad950f
8 changed files with 219 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
charmcraft.yaml
View File

@ -28,51 +28,91 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.10"
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- name: ubuntu
channel: "23.04"
architectures: [arm64]
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.10"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

2
osci.yaml
View File

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

2
src/metadata.yaml
View File

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

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

@ -96,7 +96,7 @@ applications:
channel: latest/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64.charm
relations:

4
src/tests/bundles/jammy-zed.yaml → src/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
series: jammy
@ -96,7 +96,7 @@ applications:
channel: latest/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64.charm
relations:

2
src/tests/bundles/lunar-antelope.yaml
View File

@ -96,7 +96,7 @@ applications:
channel: latest/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../octavia-dashboard_ubuntu-23.04-amd64.charm
relations:

145
src/tests/bundles/mantic-bobcat.yaml Normal file
View File

@ -0,0 +1,145 @@
variables:
openstack-origin: &openstack-origin distro
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':
'7':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
octavia-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
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
neutron-security-groups: True
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
octavia:
charm: ch:octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-23.10-amd64.charm
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'octavia:shared-db'
- 'octavia-mysql-router:shared-db'
- - 'octavia-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'neutron-api:identity-service'
- - 'keystone:identity-service'
- 'octavia:identity-service'
- - 'keystone:identity-service'
- 'openstack-dashboard:identity-service'
- - 'rabbitmq-server:amqp'
- 'neutron-api:amqp'
- - 'rabbitmq-server:amqp'
- 'octavia:amqp'
- - 'rabbitmq-server:amqp'
- 'neutron-openvswitch:amqp'
- - 'neutron-openvswitch:neutron-plugin'
- 'octavia:neutron-openvswitch'
- - 'openstack-dashboard:dashboard-plugin'
- 'octavia-dashboard:dashboard'

8
src/tests/tests.yaml
View File

@ -1,14 +1,15 @@
charm_name: octavia-dashboard
gate_bundles:
- jammy-zed
- jammy-antelope
smoke_bundles:
- jammy-zed
- jammy-antelope
dev_bundles:
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
comment:
@ -26,3 +27,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat