Skip to content

Commit

Permalink
Update the bundles to use the stable track, edge risk for yoga
Browse files Browse the repository at this point in the history
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.

Remove impish bundle.

Change-Id: I4f2dc6035e84ca9f9a40d2b9119faf0176a38f4e
  • Loading branch information
ajkavanagh committed Oct 19, 2022
1 parent b48a363 commit 56c39bb
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 372 deletions.
2 changes: 0 additions & 2 deletions osci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
- charm-unit-jobs-py38
- charm-unit-jobs-py310
- charm-yoga-functional-jobs
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: manila-ganesha
Expand Down
20 changes: 10 additions & 10 deletions src/tests/bundles/focal-xena.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena

local_overlay_enabled: True
local_overlay_enabled: False

series: focal

Expand Down Expand Up @@ -42,25 +42,25 @@ services:

manila-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
manila-ganesha-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge

mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
Expand All @@ -71,7 +71,7 @@ services:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge

manila-ganesha-az1:
num_units: 3
Expand Down Expand Up @@ -204,7 +204,7 @@ services:
source: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 3.9/edge

keystone:
charm: ch:keystone
Expand Down
20 changes: 10 additions & 10 deletions src/tests/bundles/focal-yoga.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga

local_overlay_enabled: True
local_overlay_enabled: False

series: focal

Expand Down Expand Up @@ -42,25 +42,25 @@ services:

manila-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
manila-ganesha-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge

mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
Expand All @@ -71,7 +71,7 @@ services:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge

manila-ganesha-az1:
num_units: 3
Expand Down Expand Up @@ -204,7 +204,7 @@ services:
source: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 3.9/edge

keystone:
charm: ch:keystone
Expand Down
Loading

0 comments on commit 56c39bb

Please sign in to comment.