openstack
/
charm-octavia-dashboard
Code Issues Proposed changes

Add Antelope support 

* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: I05dd97424675cc31ef4e637c5d157c69d6906e54
This commit is contained in:
Corey Bryant 2023-02-14 21:26:02 +00:00
parent 327753c63a
commit ff426e8ea3
9 changed files with 169 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -1,4 +1,4 @@
- project:
templates:
- openstack-python3-charm-zed-jobs
- openstack-python3-charm-jobs
- openstack-cover-jobs

12
charmcraft.yaml
View File

@ -31,6 +31,9 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [amd64]
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
@ -42,6 +45,9 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "22.04"
@ -53,6 +59,9 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
@ -64,3 +73,6 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [s390x]
- name: ubuntu
channel: "23.04"
architectures: [s390x]

2
osci.yaml
View File

@ -1,7 +1,7 @@
- project:
templates:
- charm-unit-jobs-py310
- charm-zed-functional-jobs
- charm-functional-jobs
vars:
needs_charm_build: true
charm_build_name: octavia-dashboard

1
src/metadata.yaml
View File

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

145
src/tests/bundles/jammy-antelope.yaml Normal file
View File

@ -0,0 +1,145 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-antelope
series: jammy
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-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-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'

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

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

2
src/tests/bundles/kinetic-zed.yaml
View File

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

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

9
src/tests/tests.yaml
View File

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