Update the bundles to use the stable track, edge risk for yoga
The bundles for the yoga channel currently point to "latest/edge" channel for all the charms. This update points the charms to the appropriate channel for the charm being used, either from ceph, openstack, ovn or the misc tracks. Change-Id: Ia72cdd5530e8a624c0ccc8ebb5b3992ce19cca82
This commit is contained in:
parent
08613ddd32
commit
b05a983151
|
@ -37,7 +37,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
|
||||||
|
|
||||||
# Needed for charm-glance:
|
# 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'
|
tempest<24.0.0;python_version<'3.6'
|
||||||
|
|
||||||
croniter # needed for charm-rabbitmq-server unit tests
|
croniter # needed for charm-rabbitmq-server unit tests
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
openstack-origin: &openstack-origin cloud:focal-xena
|
||||||
|
|
||||||
|
@ -28,13 +30,13 @@ applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
|
@ -45,7 +47,7 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
|
@ -61,7 +63,7 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: latest/edge
|
channel: 3.9/edge
|
||||||
|
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: ch:ceph-mon
|
charm: ch:ceph-mon
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||||
|
|
||||||
|
@ -28,13 +30,13 @@ applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
|
@ -45,7 +47,7 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
|
@ -61,7 +63,7 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: latest/edge
|
channel: 3.9/edge
|
||||||
|
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: ch:ceph-mon
|
charm: ch:ceph-mon
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
@ -28,13 +30,13 @@ applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
|
@ -45,7 +47,7 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
|
@ -61,7 +63,7 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: latest/edge
|
channel: 3.9/edge
|
||||||
|
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: ch:ceph-mon
|
charm: ch:ceph-mon
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
@ -28,13 +30,13 @@ applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
|
@ -45,7 +47,7 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
channel: latest/edge
|
channel: 8.0/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
|
@ -61,7 +63,7 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: latest/edge
|
channel: 3.9/edge
|
||||||
|
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: ch:ceph-mon
|
charm: ch:ceph-mon
|
||||||
|
|
Loading…
Reference in New Issue