openstack/charm-neutron-api-plugin-ovn
Code Issues Proposed changes

Add 2023.2 Bobcat support

Browse Source 
* 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: Ibb10bdf41174601af3a2145f3802c48586c44878
This commit is contained in:
Corey Bryant 2023-07-18 16:47:19 -04:00
parent 63adc21543
commit ddf5ff8a3b
7 changed files with 224 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
charmcraft.yaml
View File

@ -14,101 +14,100 @@ parts:
build-environment:
- CHARM_INTERFACES_DIR: /root/project/interfaces/
- CHARM_LAYERS_DIR: /root/project/layers/
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- amd64
architectures: [amd64]
run-on:
- name: ubuntu
channel: "22.04"
architectures:
- amd64
- name: ubuntu
channel: "22.10"
architectures:
- amd64
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- s390x
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures:
- s390x
- name: ubuntu
channel: "22.10"
architectures:
- s390x
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- ppc64el
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures:
- ppc64el
- name: ubuntu
channel: "22.10"
architectures:
- ppc64el
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- arm64
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures:
- arm64
- name: ubuntu
channel: "22.10"
architectures:
- arm64
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures:
- amd64
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures:
- amd64
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures:
- s390x
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures:
- s390x
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures:
- ppc64el
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures:
- ppc64el
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.04"
architectures:
- arm64
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures:
- arm64
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: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
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: neutron-api-plugin-ovn
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/edge

2
src/metadata.yaml
View File

@ -9,8 +9,8 @@ tags:
- networking
series:
- jammy
- kinetic
- lunar
- mantic
subordinate: true
requires:
container:

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

@ -44,7 +44,7 @@ applications:
source: *openstack-origin
channel: latest/edge
neutron-api-plugin-ovn:
charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64.charm
hacluster-neutron-api:
charm: ch:hacluster
channel: latest/edge

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
local_overlay_enabled: False
@ -44,7 +44,7 @@ applications:
source: *openstack-origin
channel: latest/edge
neutron-api-plugin-ovn:
charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64.charm
hacluster-neutron-api:
charm: ch:hacluster
channel: latest/edge

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

@ -0,0 +1,166 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series mantic
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
nova-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: ch:mysql-router
channel: latest/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
constraints: mem=3072M
charm: ch:mysql-innodb-cluster
num_units: 3
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
neutron-api-plugin-ovn:
charm: ../../../neutron-api-plugin-ovn_ubuntu-23.10-amd64.charm
hacluster-neutron-api:
charm: ch:hacluster
channel: latest/edge
neutron-api:
charm: ch:neutron-api
series: *series
num_units: 3
options:
# NOTE(fnordahl): At current state of upstream Neutron development this
# is a requirement. Remove once fixed upstream.
enable-ml2-port-security: true
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
channel: latest/edge
ovn-chassis:
charm: ch:ovn-chassis
channel: latest/edge
nova-compute:
constraints: "root-disk=20G mem=4G"
charm: ch:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
relations:
- - hacluster-neutron-api:ha
- neutron-api:ha
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - neutron-api:identity-service
- keystone:identity-service
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
- - nova-compute:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:identity-service
- keystone:identity-service
- - nova-cloud-controller:cloud-compute
- nova-compute:cloud-compute
- - glance:identity-service
- keystone:identity-service
- - glance:amqp
- rabbitmq-server:amqp
- - nova-compute:image-service
- glance:image-service
- - nova-cloud-controller:image-service
- glance:image-service
- - placement:identity-service
- keystone:identity-service
- - placement:placement
- nova-cloud-controller:placement
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - neutron-api:certificates
- vault:certificates
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["glance:shared-db", "glance-mysql-router:shared-db"]
- ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["placement:shared-db", "placement-mysql-router:shared-db"]
- ["vault:shared-db", "vault-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

8
src/tests/tests.yaml
View File

@ -1,14 +1,15 @@
charm_name: neutron-api-plugin-ovn
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:
neutron-api-plugin-ovn:
@ -37,3 +38,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat