openstack
/
charm-heat
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.

Change-Id: I89e112b6a48eb25d8f4e0285542d510bbdeb15ea
This commit is contained in:
Alex Kavanagh 2022-06-17 11:47:21 +01:00
parent 53b6978b96
commit 66d289d883
3 changed files with 16 additions and 15 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

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

@ -32,22 +32,22 @@ applications:
heat-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
placement-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
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -58,7 +58,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
keystone:
charm: ch:keystone

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

@ -32,22 +32,22 @@ applications:
heat-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
placement-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
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -58,7 +58,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
keystone:
charm: ch:keystone