openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

Update the bundles to use the stable track, edge risk for xena 

This update points the charms to the appropriate channel for
the charm being used, either from ceph, openstack, ovn or the
misc tracks for xena.

- Pin tempest for python<3.8

Change-Id: Ie167ce781704895d0aefc9b36fcf8f15d57e7ff1
This commit is contained in:
Alex Kavanagh 2022-06-17 11:48:05 +01:00 committed by Felipe Reyes
parent 13728087c7
commit 3294ca071b
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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'
tempest<24.0.0;python_version<'3.6'
croniter # needed for charm-rabbitmq-server unit tests

18
tests/bundles/focal-wallaby-dvr-snat.yaml
View File

@ -30,22 +30,22 @@ machines:
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-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
neutron-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
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
@ -55,7 +55,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -144,7 +144,7 @@ applications:
source: *openstack-origin
to:
- '12'
channel: openstack-xena/edge
channel: 21.09/edge
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: xena/edge
@ -153,7 +153,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:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

18
tests/bundles/focal-xena-dvr-snat.yaml
View File

@ -30,22 +30,22 @@ machines:
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-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
neutron-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
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
@ -55,7 +55,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -144,7 +144,7 @@ applications:
source: *openstack-origin
to:
- '12'
channel: openstack-xena/edge
channel: 21.09/edge
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: xena/edge
@ -153,7 +153,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:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'