openstack
/
charm-neutron-gateway
Code Issues Proposed changes

Update the charmcraft.yaml for xena (no 22.04 base) 

- Build on 20.04 amd64
- Run on 20.04 amd64, s390x, ppc64el, arm64

Change-Id: Id055c1e2061f5736285611cca9bfa99c3c93f6a5
This commit is contained in:
Alex Kavanagh 2022-05-16 18:49:22 +01:00 committed by Liam Young
parent bbd3b50beb
commit 6fabe3ed99
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charmcraft.yaml
View File

@ -26,9 +26,7 @@ bases:
channel: "20.04"
architectures:
- amd64
- s390x
- ppc64el
- arm64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]

3
test-requirements.txt
View File

@ -42,7 +42,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/xena#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/xena#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
tempest<24.0.0;python_version<'3.6'
croniter # needed for charm-rabbitmq-server unit tests

23
tests/bundles/focal-wallaby.yaml
View File

@ -33,19 +33,19 @@ applications:
neutron-api-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -56,7 +56,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -103,7 +103,7 @@ applications:
charm: ch:neutron-openvswitch
channel: xena/edge
neutron-gateway:
charm: "../../../neutron-gateway"
charm: ../../neutron-gateway.charm
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -117,11 +117,12 @@ applications:
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
source: *openstack-origin
to:
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
# neutron-gateway for migration test purposes.
- '7'
channel: openstack-xena/edge
channel: 21.09/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -154,7 +155,7 @@ applications:
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
@ -168,7 +169,7 @@ applications:
source: *openstack-origin
to:
- '13'
channel: openstack-xena/edge
channel: 21.09/edge
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: xena/edge
@ -177,7 +178,7 @@ applications:
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: openstack-xena/edge
channel: 21.09/edge
relations:

22
tests/bundles/focal-xena.yaml
View File

@ -33,19 +33,19 @@ applications:
neutron-api-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -56,7 +56,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -103,7 +103,7 @@ applications:
charm: ch:neutron-openvswitch
channel: xena/edge
neutron-gateway:
charm: "../../../neutron-gateway"
charm: ../../neutron-gateway.charm
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -121,7 +121,7 @@ applications:
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
# neutron-gateway for migration test purposes.
- '7'
channel: openstack-xena/edge
channel: 21.09/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -154,7 +154,7 @@ applications:
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
@ -168,7 +168,7 @@ applications:
source: *openstack-origin
to:
- '13'
channel: openstack-xena/edge
channel: 21.09/edge
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: xena/edge
@ -177,7 +177,7 @@ applications:
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: openstack-xena/edge
channel: 21.09/edge
relations: