Switch charm to Bobcat

Switch charm to Bobcat release. Microk8s 1.28 will be the default
for Bobcat. Also ensure images are being collected from
ghcr.io/canonical

Change-Id: I6e298dba0607271d0119cc0334f69da192012182
This commit is contained in:
Liam Young 2023-10-05 06:17:18 +00:00
parent bb326e963c
commit be850b56b5
5 changed files with 12 additions and 12 deletions

View File

@ -1,11 +1,11 @@
- project:
templates:
- openstack-python3-charm-yoga-jobs
- openstack-python3-charm-jobs
- openstack-cover-jobs
- microk8s-func-test
vars:
charm_build_name: magnum-k8s
juju_channel: 3.1/stable
juju_classic_mode: false
microk8s_channel: 1.26-strict/stable
microk8s_channel: 1.28-strict/stable
microk8s_classic_mode: false

View File

@ -49,7 +49,7 @@ magnum-k8s requires the following relations:
The charm by default uses following images:
`ghcr.io/openstack-snaps/magnum-consolidated:2023.1`
`ghcr.io/canonical/magnum-consolidated:2023.2`
## Contributing

View File

@ -26,13 +26,13 @@ resources:
magnum-api-image:
type: oci-image
description: OCI image for OpenStack magnum
# ghcr.io/canonical/magnum-consolidated:2023.1
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.1
# ghcr.io/canonical/magnum-consolidated:2023.2
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.2
magnum-conductor-image:
type: oci-image
description: OCI image for OpenStack magnum
# ghcr.io/canonical/magnum-consolidated:2023.1
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.1
# ghcr.io/canonical/magnum-consolidated:2023.2
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.2
requires:
database:

View File

@ -7,4 +7,4 @@
build_type: charmcraft
publish_charm: true
charmcraft_channel: 2.0/stable
publish_channel: 2023.1/edge
publish_channel: 2023.2/edge

View File

@ -27,7 +27,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.1/edge
channel: 2023.2/edge
scale: 1
trust: false
options:
@ -38,7 +38,7 @@ applications:
glance:
charm: ch:glance-k8s
channel: 2023.1/edge
channel: 2023.2/edge
scale: 1
trust: false
storage:
@ -49,8 +49,8 @@ applications:
scale: 1
trust: false
resources:
magnum-api-image: ghcr.io/openstack-snaps/magnum-consolidated:2023.1
magnum-conductor-image: ghcr.io/openstack-snaps/magnum-consolidated:2023.1
magnum-api-image: ghcr.io/canonical/magnum-consolidated:2023.2
magnum-conductor-image: ghcr.io/canonical/magnum-consolidated:2023.2
relations: