openstack/sunbeam-charms
Code Issues Proposed changes

Update for 2024.1

Browse Source 
Refresh 2023.2 -> 2024.1 which will impact all charms, so we
should not need to pre-seed the edge channel before this works.

Refresh 23.09 -> 24.03 for OVN charms.

Option sql_connection is removed form 2024.1 release [1]
Use below snippet for magnum-k8s conf template
[database]
connection = <>

Update horizon local_settings.py.j2 template

[1] https://docs.openstack.org/releasenotes/oslo.db/en_GB/2024.1.html

Mark tempest test as non-voting as its currently unstable.

Change-Id: I4e277a4c5e438e2f2112a167b0f3050c1526cd0a
This commit is contained in:
James Page 2024-04-12 13:37:22 +01:00
parent 42b4490abc
commit 42e8bc6e42
75 changed files with 266 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charms/aodh-k8s/README.md
View File

@ -49,7 +49,7 @@ aodh-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/aodh-consolidated:2023.2
ghcr.io/canonical/aodh-consolidated:2024.1
## Contributing

20
charms/aodh-k8s/metadata.yaml
View File

@ -34,28 +34,28 @@ resources:
aodh-api-image:
type: oci-image
description: OCI image for OpenStack aodh api service
# ghcr.io/canonical/aodh-consolidated:2023.2
upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
# ghcr.io/canonical/aodh-consolidated:2024.1
upstream-source: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-evaluator-image:
type: oci-image
description: OCI image for OpenStack aodh evaluator service
# ghcr.io/canonical/aodh-consolidated:2023.2
upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
# ghcr.io/canonical/aodh-consolidated:2024.1
upstream-source: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-notifier-image:
type: oci-image
description: OCI image for OpenStack aodh notifier service
# ghcr.io/canonical/aodh-consolidated:2023.2
upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
# ghcr.io/canonical/aodh-consolidated:2024.1
upstream-source: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-listener-image:
type: oci-image
description: OCI image for OpenStack aodh listener service
# ghcr.io/canonical/aodh-consolidated:2023.2
upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
# ghcr.io/canonical/aodh-consolidated:2024.1
upstream-source: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-expirer-image:
type: oci-image
description: OCI image for OpenStack aodh expirer service
# ghcr.io/canonical/aodh-consolidated:2023.2
upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
# ghcr.io/canonical/aodh-consolidated:2024.1
upstream-source: ghcr.io/canonical/aodh-consolidated:2024.1
requires:
database:

16
charms/aodh-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -44,12 +44,12 @@ applications:
credential-keys: 5M
gnocchi:
charm: ch:gnocchi-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
ceilometer:
charm: ch:ceilometer-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
aodh:
@ -57,11 +57,11 @@ applications:
scale: 1
trust: true
resources:
aodh-api-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-api-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/barbican-k8s/README.md
View File

@ -51,7 +51,7 @@ barbican-k8s requires the following relations:
The charm by default uses following images:
`ghcr.io/canonical/barbican-consolidated:2023.2`
`ghcr.io/canonical/barbican-consolidated:2024.1`
## Contributing

4
charms/barbican-k8s/metadata.yaml
View File

@ -60,8 +60,8 @@ resources:
barbican-api-image:
type: oci-image
description: OCI image for OpenStack Barbican API
upstream-source: ghcr.io/canonical/barbican-consolidated:2023.2
upstream-source: ghcr.io/canonical/barbican-consolidated:2024.1
barbican-worker-image:
type: oci-image
description: OCI image for OpenStack Barbican worker
upstream-source: ghcr.io/canonical/barbican-consolidated:2023.2
upstream-source: ghcr.io/canonical/barbican-consolidated:2024.1

6
charms/barbican-k8s/tests/bundles/smoke.yaml
View File

@ -27,7 +27,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: false
options:
@ -47,8 +47,8 @@ applications:
scale: 1
trust: false
resources:
barbican-api-image: ghcr.io/canonical/barbican-consolidated:2023.2
barbican-worker-image: ghcr.io/canonical/barbican-consolidated:2023.2
barbican-api-image: ghcr.io/canonical/barbican-consolidated:2024.1
barbican-worker-image: ghcr.io/canonical/barbican-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/ceilometer-k8s/README.md
View File

@ -47,7 +47,7 @@ ceilometer-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/ceilometer-consolidated:2023.2
ghcr.io/canonical/ceilometer-consolidated:2024.1
## Contributing

8
charms/ceilometer-k8s/metadata.yaml
View File

@ -28,14 +28,14 @@ resources:
ceilometer-central-image:
type: oci-image
description: OCI image for OpenStack ceilometer central
# ghcr.io/canonical/ceilometer-central:2023.2
upstream-source: ghcr.io/canonical/ceilometer-consolidated:2023.2
# ghcr.io/canonical/ceilometer-central:2024.1
upstream-source: ghcr.io/canonical/ceilometer-consolidated:2024.1
ceilometer-notification-image:
type: oci-image
description: OCI image for OpenStack ceilometer notification
# ghcr.io/canonical/ceilometer-notification:2023.2
# ghcr.io/canonical/ceilometer-notification:2024.1
description: OCI image for OpenStack ceilometer
upstream-source: ghcr.io/canonical/ceilometer-consolidated:2023.2
upstream-source: ghcr.io/canonical/ceilometer-consolidated:2024.1
provides:
ceilometer-service:

10
charms/ceilometer-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -44,7 +44,7 @@ applications:
credential-keys: 5M
gnocchi:
charm: ch:gnocchi-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
ceilometer:
@ -52,11 +52,11 @@ applications:
scale: 1
trust: true
resources:
ceilometer-central-image: ghcr.io/canonical/ceilometer-consolidated:2023.2
ceilometer-notification-image: ghcr.io/canonical/ceilometer-consolidated:2023.2
ceilometer-central-image: ghcr.io/canonical/ceilometer-consolidated:2024.1
ceilometer-notification-image: ghcr.io/canonical/ceilometer-consolidated:2024.1
aodh:
charm: ch:aodh-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true

2
charms/cinder-ceph-k8s/CONTRIBUTING.md
View File

@ -47,7 +47,7 @@ run:
To deploy the local test instance:
juju deploy ./cinder-ceph-k8s_ubuntu-20.04-amd64.charm --resource cinder-volume-image=ghcr.io/canonical/cinder-volume:2023.2
juju deploy ./cinder-ceph-k8s_ubuntu-20.04-amd64.charm --resource cinder-volume-image=ghcr.io/canonical/cinder-volume:2024.1
<!-- LINKS -->

2
charms/cinder-ceph-k8s/README.md
View File

@ -45,7 +45,7 @@ cinder-ceph-k8s requires the following relations:
## OCI Images
The charm by default uses `ghcr.io/canonical/cinder-volume:2023.2`
The charm by default uses `ghcr.io/canonical/cinder-volume:2024.1`
## Contributing

2
charms/cinder-ceph-k8s/metadata.yaml
View File

@ -29,7 +29,7 @@ resources:
cinder-volume-image:
type: oci-image
description: OCI image for OpenStack Cinder Volume
upstream-source: ghcr.io/canonical/cinder-consolidated:2023.2
upstream-source: ghcr.io/canonical/cinder-consolidated:2024.1
requires:
amqp:

6
charms/cinder-ceph-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -45,7 +45,7 @@ applications:
cinder:
charm: ch:cinder-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
@ -55,7 +55,7 @@ applications:
scale: 1
trust: true
resources:
cinder-volume-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-volume-image: ghcr.io/canonical/cinder-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/cinder-k8s/CONTRIBUTING.md
View File

@ -47,7 +47,7 @@ run:
To deploy the local test instance:
juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=ghcr.io/canonical/cinder-api:2023.2 --resource cinder-scheduler-image=ghcr.io/canonical/cinder-scheduler:2023.2
juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=ghcr.io/canonical/cinder-api:2024.1 --resource cinder-scheduler-image=ghcr.io/canonical/cinder-scheduler:2024.1
<!-- LINKS -->

4
charms/cinder-k8s/README.md
View File

@ -49,8 +49,8 @@ cinder-k8s requires the following relations:
The charm by default uses follwoing images:
`ghcr.io/canonical/cinder-api:2023.2`
`ghcr.io/canonical/cinder-scheduler:2023.2`
`ghcr.io/canonical/cinder-api:2024.1`
`ghcr.io/canonical/cinder-scheduler:2024.1`
## Contributing

4
charms/cinder-k8s/metadata.yaml
View File

@ -30,11 +30,11 @@ resources:
cinder-api-image:
type: oci-image
description: OCI image for OpenStack Cinder API
upstream-source: ghcr.io/canonical/cinder-consolidated:2023.2
upstream-source: ghcr.io/canonical/cinder-consolidated:2024.1
cinder-scheduler-image:
type: oci-image
description: OCI image for OpenStack Cinder Scheduler
upstream-source: ghcr.io/canonical/cinder-consolidated:2023.2
upstream-source: ghcr.io/canonical/cinder-consolidated:2024.1
requires:
database:

6
charms/cinder-k8s/tests/bundles/smoke.yaml
View File

@ -33,7 +33,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -47,8 +47,8 @@ applications:
scale: 1
trust: true
resources:
cinder-api-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-scheduler-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-api-image: ghcr.io/canonical/cinder-consolidated:2024.1
cinder-scheduler-image: ghcr.io/canonical/cinder-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/designate-k8s/CONTRIBUTING.md
View File

@ -46,7 +46,7 @@ run:
To deploy the local test instance:
juju deploy ./designate-k8s_ubuntu-20.04-amd64.charm --trust --resource designate-image=ghcr.io/canonical/designate:2023.2
juju deploy ./designate-k8s_ubuntu-20.04-amd64.charm --trust --resource designate-image=ghcr.io/canonical/designate:2024.1
<!-- LINKS -->

2
charms/designate-k8s/README.md
View File

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

2
charms/designate-k8s/metadata.yaml
View File

@ -25,7 +25,7 @@ resources:
designate-image:
type: oci-image
description: OCI image for OpenStack designate
upstream-source: ghcr.io/canonical/designate-consolidated:2023.2
upstream-source: ghcr.io/canonical/designate-consolidated:2024.1
requires:
database:

4
charms/designate-k8s/tests/bundles/smoke.yaml
View File

@ -26,7 +26,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: false
options:
@ -46,7 +46,7 @@ applications:
scale: 1
trust: false
resources:
designate-image: ghcr.io/canonical/designate-consolidated:2023.2
designate-image: ghcr.io/canonical/designate-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/glance-k8s/CONTRIBUTING.md
View File

@ -47,7 +47,7 @@ run:
To deploy the local test instance:
juju deploy ./glance-k8s_ubuntu-20.04-amd64.charm --trust --resource glance-image=ghcr.io/canonical/glance-api:2023.2
juju deploy ./glance-k8s_ubuntu-20.04-amd64.charm --trust --resource glance-image=ghcr.io/canonical/glance-api:2024.1
<!-- LINKS -->

2
charms/glance-k8s/README.md
View File

@ -47,7 +47,7 @@ glance-k8s requires the following relations:
## OCI Images
The charm by default uses `ghcr.io/canonical/glance-api:2023.2` image.
The charm by default uses `ghcr.io/canonical/glance-api:2024.1` image.
## Contributing

4
charms/glance-k8s/metadata.yaml
View File

@ -36,8 +36,8 @@ resources:
glance-api-image:
type: oci-image
description: OCI image for OpenStack Glance
# ghcr.io/canonical/glance-api:2023.2
upstream-source: ghcr.io/canonical/glance-api:2023.2
# ghcr.io/canonical/glance-api:2024.1
upstream-source: ghcr.io/canonical/glance-api:2024.1
storage:
local-repository:

4
charms/glance-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -47,7 +47,7 @@ applications:
scale: 1
trust: true
resources:
glance-api-image: ghcr.io/canonical/glance-api:2023.2
glance-api-image: ghcr.io/canonical/glance-api:2024.1
storage:
local-repository: 5G

2
charms/gnocchi-k8s/README.md
View File

@ -46,7 +46,7 @@ gnocchi-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/gnocchi-consolidated:2023.2
ghcr.io/canonical/gnocchi-consolidated:2024.1
## Contributing

8
charms/gnocchi-k8s/metadata.yaml
View File

@ -28,13 +28,13 @@ resources:
gnocchi-api-image:
type: oci-image
description: OCI image for OpenStack Gnocchi api service
# ghcr.io/canonical/gnocchi-api:2023.2
upstream-source: ghcr.io/canonical/gnocchi-consolidated:2023.2
# ghcr.io/canonical/gnocchi-api:2024.1
upstream-source: ghcr.io/canonical/gnocchi-consolidated:2024.1
gnocchi-metricd-image:
type: oci-image
description: OCI image for OpenStack Gnocchi Metric service
# ghcr.io/canonical/gnocchi-metricd:2023.2
upstream-source: ghcr.io/canonical/gnocchi-consolidated:2023.2
# ghcr.io/canonical/gnocchi-metricd:2024.1
upstream-source: ghcr.io/canonical/gnocchi-consolidated:2024.1
requires:
database:

2
charms/gnocchi-k8s/tests/bundles/smoke.yaml
View File

@ -26,7 +26,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:

2
charms/heat-k8s/README.md
View File

@ -60,7 +60,7 @@ heat-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/heat-consolidated:2023.2
ghcr.io/canonical/heat-consolidated:2024.1
## Contributing

8
charms/heat-k8s/metadata.yaml
View File

@ -29,13 +29,13 @@ resources:
heat-api-image:
type: oci-image
description: OCI image for OpenStack Heat
# ghcr.io/canonical/heat-api:2023.2
upstream-source: ghcr.io/canonical/heat-consolidated:2023.2
# ghcr.io/canonical/heat-api:2024.1
upstream-source: ghcr.io/canonical/heat-consolidated:2024.1
heat-engine-image:
type: oci-image
description: OCI image for OpenStack Heat Engine
# ghcr.io/canonical/heat-engine:2023.2
upstream-source: ghcr.io/canonical/heat-consolidated:2023.2
# ghcr.io/canonical/heat-engine:2024.1
upstream-source: ghcr.io/canonical/heat-consolidated:2024.1
requires:
database:

6
charms/heat-k8s/tests/bundles/smoke.yaml
View File

@ -33,7 +33,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -47,8 +47,8 @@ applications:
scale: 1
trust: true
resources:
heat-api-image: ghcr.io/canonical/heat-consolidated:2023.2
heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2
heat-api-image: ghcr.io/canonical/heat-consolidated:2024.1
heat-engine-image: ghcr.io/canonical/heat-consolidated:2024.1
relations:
- - traefik:ingress

2
charms/horizon-k8s/CONTRIBUTING.md
View File

@ -45,7 +45,7 @@ run:
To deploy the local test instance:
juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource horizon-image=ghcr.io/canonical/horizon:2023.2
juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource horizon-image=ghcr.io/canonical/horizon:2024.1
<!-- LINKS -->

2
charms/horizon-k8s/README.md
View File

@ -44,7 +44,7 @@ horizon-k8s requires the following relations:
## OCI Images
The charm by default uses `ghcr.io/canonical/horizon:2023.2` image.
The charm by default uses `ghcr.io/canonical/horizon:2024.1` image.
## Contributing

4
charms/horizon-k8s/metadata.yaml
View File

@ -26,8 +26,8 @@ resources:
horizon-image:
type: oci-image
description: OCI image for Horizon
# ghcr.io/canonical/horizon:2023.2
upstream-source: ghcr.io/canonical/horizon:2023.2
# ghcr.io/canonical/horizon:2024.1
upstream-source: ghcr.io/canonical/horizon:2024.1
requires:
database:

6
charms/horizon-k8s/src/templates/local_settings.py.j2
View File

@ -2,7 +2,7 @@
import os
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from horizon.utils import secret_key
@ -147,7 +147,7 @@ SECRET_KEY = "{{ options.secret }}"
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
'LOCATION': '127.0.0.1:11211',
},
}
@ -847,7 +847,7 @@ LOGIN_REDIRECT_URL='{{ ingress_public.ingress_path }}'
# By default, validation of the HTTP Host header is disabled. Production
# installations should have this set accordingly. For more information
# see https://docs.djangoproject.com/en/dev/ref/settings/.
ALLOWED_HOSTS = '*'
ALLOWED_HOSTS = ['*']
# Compress all assets offline as part of packaging installation
#COMPRESS_OFFLINE = True

2
charms/keystone-k8s/CONTRIBUTING.md
View File

@ -52,7 +52,7 @@ run:
To deploy the local test instance:
juju deploy ./keystone-k8s_ubuntu-20.04-amd64.charm --trust --resource keystone-image=ghcr.io/canonical/keystone:2023.2
juju deploy ./keystone-k8s_ubuntu-20.04-amd64.charm --trust --resource keystone-image=ghcr.io/canonical/keystone:2024.1
<!-- LINKS -->

2
charms/keystone-k8s/README.md
View File

@ -72,7 +72,7 @@ developers:
## OCI Images
The charm by default uses `ghcr.io/canonical/keystone:2023.2` image.
The charm by default uses `ghcr.io/canonical/keystone:2024.1` image.
## Contributing

4
charms/keystone-k8s/metadata.yaml
View File

@ -87,5 +87,5 @@ resources:
keystone-image:
type: oci-image
description: OCI image for OpenStack Keystone
# ghcr.io/canonical/keystone:2023.2
upstream-source: ghcr.io/canonical/keystone:2023.2
# ghcr.io/canonical/keystone:2024.1
upstream-source: ghcr.io/canonical/keystone:2024.1

2
charms/keystone-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
# NOTE: should be in sync with resources described in ../../metadata.yaml
glance:

4
charms/keystone-ldap-k8s/tests/bundles/smoke.yaml
View File

@ -25,7 +25,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
series: jammy
scale: 1
trust: true
@ -46,7 +46,7 @@ applications:
glance:
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
storage:

2
charms/magnum-k8s/README.md
View File

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

8
charms/magnum-k8s/metadata.yaml
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.2
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.2
# ghcr.io/canonical/magnum-consolidated:2024.1
upstream-source: ghcr.io/canonical/magnum-consolidated:2024.1
magnum-conductor-image:
type: oci-image
description: OCI image for OpenStack magnum
# ghcr.io/canonical/magnum-consolidated:2023.2
upstream-source: ghcr.io/canonical/magnum-consolidated:2023.2
# ghcr.io/canonical/magnum-consolidated:2024.1
upstream-source: ghcr.io/canonical/magnum-consolidated:2024.1
requires:
database:

5
charms/magnum-k8s/src/templates/magnum.conf.j2
View File

@ -5,10 +5,7 @@ state_path = /var/lib/magnum
transport_url = {{ amqp.transport_url }}
{% if database.connection -%}
sql_connection = {{ database.connection }}
{% endif -%}
db_auto_create = false
{% include "parts/section-database" %}
{% include "parts/section-identity" %}

8
charms/magnum-k8s/tests/bundles/smoke.yaml
View File

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

2
charms/neutron-k8s/CONTRIBUTING.md
View File

@ -48,7 +48,7 @@ run:
To deploy the local test instance:
juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=ghcr.io/canonical/neutron-server:2023.2
juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=ghcr.io/canonical/neutron-server:2024.1
<!-- LINKS -->

2
charms/neutron-k8s/README.md
View File

@ -50,7 +50,7 @@ neutron-k8s requires the following relations:
## OCI Images
The charm by default uses `ghcr.io/canonical/neutron-server:2023.2` image.
The charm by default uses `ghcr.io/canonical/neutron-server:2024.1` image.
## Contributing

4
charms/neutron-k8s/metadata.yaml
View File

@ -30,8 +30,8 @@ resources:
neutron-server-image:
type: oci-image
description: OCI image for OpenStack Neutron API
# ghcr.io/canonical/neutron-server:2023.2
upstream-source: ghcr.io/canonical/neutron-server:2023.2
# ghcr.io/canonical/neutron-server:2024.1
upstream-source: ghcr.io/canonical/neutron-server:2024.1
provides:
neutron-api:

4
charms/neutron-k8s/tests/bundles/smoke.yaml
View File

@ -27,7 +27,7 @@ applications:
minimum-replicas: 1
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -42,7 +42,7 @@ applications:
options:
debug: true
resources:
neutron-server-image: ghcr.io/canonical/neutron-server:2023.2
neutron-server-image: ghcr.io/canonical/neutron-server:2024.1
ovn-central:
charm: ch:ovn-central-k8s
channel: 23.03/edge

2
charms/nova-k8s/CONTRIBUTING.md
View File

@ -50,7 +50,7 @@ run:
To deploy the local test instance:
juju deploy ./nova-k8s_ubuntu-20.04-amd64.charm --trust --resource nova-api-image=ghcr.io/canonical/nova-api:2023.2 --resource nova-scheduler-image=ghcr.io/canonical/nova-scheduler:2023.2 --resource nova-conductor-image=ghcr.io/canonical/nova-conductor:2023.2
juju deploy ./nova-k8s_ubuntu-20.04-amd64.charm --trust --resource nova-api-image=ghcr.io/canonical/nova-api:2024.1 --resource nova-scheduler-image=ghcr.io/canonical/nova-scheduler:2024.1 --resource nova-conductor-image=ghcr.io/canonical/nova-conductor:2024.1
<!-- LINKS -->

6
charms/nova-k8s/README.md
View File

@ -50,9 +50,9 @@ nova-k8s requires the following relations:
The charm by default uses following images:
`ghcr.io/canonical/nova-api:2023.2`
`ghcr.io/canonical/nova-scheduler:2023.2`
`ghcr.io/canonical/nova-conductor:2023.2`
`ghcr.io/canonical/nova-api:2024.1`
`ghcr.io/canonical/nova-scheduler:2024.1`
`ghcr.io/canonical/nova-conductor:2024.1`
## Contributing

6
charms/nova-k8s/metadata.yaml
View File

@ -37,15 +37,15 @@ resources:
nova-api-image:
type: oci-image
description: OCI image for OpenStack Nova API
upstream-source: ghcr.io/canonical/nova-consolidated:2023.2
upstream-source: ghcr.io/canonical/nova-consolidated:2024.1
nova-scheduler-image:
type: oci-image
description: OCI image for OpenStack Nova Scheduler
upstream-source: ghcr.io/canonical/nova-consolidated:2023.2
upstream-source: ghcr.io/canonical/nova-consolidated:2024.1
nova-conductor-image:
type: oci-image
description: OCI image for OpenStack Nova Conductor
upstream-source: ghcr.io/canonical/nova-consolidated:2023.2
upstream-source: ghcr.io/canonical/nova-consolidated:2024.1
requires:
ingress-internal:

10
charms/nova-k8s/tests/bundles/smoke.yaml
View File

@ -34,7 +34,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -47,13 +47,13 @@ applications:
scale: 1
trust: true
resources:
nova-api-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-api-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2024.1
placement:
charm: ch:placement-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true

2
charms/octavia-k8s/README.md
View File

@ -53,7 +53,7 @@ octavia-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/octavia-consolidated:2023.2
ghcr.io/canonical/octavia-consolidated:2024.1
## Contributing

12
charms/octavia-k8s/metadata.yaml
View File

@ -42,18 +42,18 @@ resources:
octavia-api-image:
type: oci-image
description: OCI image for OpenStack octavia
# ghcr.io/canonical/octavia-api:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
# ghcr.io/canonical/octavia-api:2024.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-driver-agent-image:
type: oci-image
description: OCI image for OpenStack Octavia Driver Agent
# ghcr.io/canonical/octavia-driver-agent:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
# ghcr.io/canonical/octavia-driver-agent:2024.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-housekeeping-image:
type: oci-image
description: OCI image for OpenStack Octavia Housekeeping
# ghcr.io/canonical/octavia-housekeeping:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
# ghcr.io/canonical/octavia-housekeeping:2024.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2024.1
requires:
database:

10
charms/octavia-k8s/tests/bundles/smoke.yaml
View File

@ -27,7 +27,7 @@ applications:
minimum-replicas: 1
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -37,7 +37,7 @@ applications:
credential-keys: 5M
neutron:
charm: ch:neutron-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -47,9 +47,9 @@ applications:
scale: 1
trust: true
resources:
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2024.1
ovn-central:
charm: ch:ovn-central-k8s
channel: 23.03/edge

2
charms/openstack-exporter-k8s/tests/bundles/smoke.yaml
View File

@ -18,7 +18,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: false
options:

2
charms/openstack-hypervisor/config.yaml
View File

@ -1,6 +1,6 @@
options:
snap-channel:
default: "2023.2/edge"
default: "2024.1/edge"
type: string
debug:
default: False

6
charms/ovn-central-k8s/metadata.yaml
View File

@ -56,15 +56,15 @@ resources:
ovn-sb-db-server-image:
type: oci-image
description: OCI image for OVN Southbound Database Server
upstream-source: ghcr.io/canonical/ovn-consolidated:23.09
upstream-source: ghcr.io/canonical/ovn-consolidated:24.03
ovn-nb-db-server-image:
type: oci-image
description: OCI image for OVN Northbound Database Server
upstream-source: ghcr.io/canonical/ovn-consolidated:23.09
upstream-source: ghcr.io/canonical/ovn-consolidated:24.03
ovn-northd-image:
type: oci-image
description: OCI image for OVN Northd
upstream-source: ghcr.io/canonical/ovn-consolidated:23.09
upstream-source: ghcr.io/canonical/ovn-consolidated:24.03
requires:
certificates:

16
charms/ovn-central-k8s/tests/bundles/smoke.yaml
View File

@ -25,7 +25,7 @@ applications:
trust: true
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -35,24 +35,24 @@ applications:
credential-keys: 5M
glance:
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
storage:
local-repository: 5G
nova:
charm: ch:nova-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
placement:
charm: ch:placement-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
neutron:
charm: ch:neutron-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
ovn-central:
@ -61,9 +61,9 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:24.03
tls-operator:
charm: self-signed-certificates
channel: edge

4
charms/ovn-relay-k8s/metadata.yaml
View File

@ -26,8 +26,8 @@ resources:
ovn-sb-db-server-image:
type: oci-image
description: OCI image for OVN Southbound Database Server
# ghcr.io/canonical/ovn-sb-db-server:23.09
upstream-source: ghcr.io/canonical/ovn-consolidated:23.09
# ghcr.io/canonical/ovn-sb-db-server:24.03
upstream-source: ghcr.io/canonical/ovn-consolidated:24.03
requires:
ovsdb-cms:

14
charms/ovn-relay-k8s/tests/bundles/smoke.yaml
View File

@ -27,7 +27,7 @@ applications:
minimum-replicas: 1
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -37,29 +37,29 @@ applications:
credential-keys: 5M
glance:
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
storage:
local-repository: 5G
nova:
charm: ch:nova-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
placement:
charm: ch:placement-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
neutron:
charm: ch:neutron-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
ovn-central:
charm: ch:ovn-central-k8s
channel: 23.09/edge
channel: 24.03/edge
scale: 1
trust: true
ovn-relay:
@ -67,7 +67,7 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
tls-operator:
charm: self-signed-certificates
channel: edge

2
charms/placement-k8s/CONTRIBUTING.md
View File

@ -46,7 +46,7 @@ run:
To deploy the local test instance:
juju deploy ./placement-k8s_ubuntu-20.04-amd64.charm --trust --resource placement-image=ghcr.io/canonical/placement-api:2023.2
juju deploy ./placement-k8s_ubuntu-20.04-amd64.charm --trust --resource placement-image=ghcr.io/canonical/placement-api:2024.1
<!-- LINKS -->

2
charms/placement-k8s/README.md
View File

@ -44,7 +44,7 @@ placement-k8s requires the following relations:
## OCI Images
The charm by default uses `ghcr.io/canonical/placement-api:2023.2` image.
The charm by default uses `ghcr.io/canonical/placement-api:2024.1` image.
## Contributing

2
charms/placement-k8s/metadata.yaml
View File

@ -25,7 +25,7 @@ resources:
placement-api-image:
type: oci-image
description: OCI image for OpenStack Placement
upstream-source: ghcr.io/canonical/placement-api:2023.2
upstream-source: ghcr.io/canonical/placement-api:2024.1
requires:
database:

6
charms/placement-k8s/tests/bundles/smoke.yaml
View File

@ -32,7 +32,7 @@ applications:
keystone:
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
options:
@ -43,7 +43,7 @@ applications:
nova:
charm: ch:nova-k8s
channel: 2023.2/edge
channel: 2024.1/edge
scale: 1
trust: true
@ -52,7 +52,7 @@ applications:
scale: 1
trust: true
resources:
placement-api-image: ghcr.io/canonical/placement-api:2023.2
placement-api-image: ghcr.io/canonical/placement-api:2024.1
relations:
- - traefik:ingress

2
charms/sunbeam-clusterd/charmcraft.yaml
View File

@ -47,7 +47,7 @@ actions:
config:
options:
snap-channel:
default: "2023.2/edge"
default: "2024.1/edge"
type: string
debug:
default: False

4
charms/tempest-k8s/charmcraft.yaml
View File

@ -54,8 +54,8 @@ resources:
tempest-image:
type: oci-image
description: OCI image for tempest
# ghcr.io/canonical/tempest:2023.2
upstream-source: ghcr.io/canonical/tempest:2023.2
# ghcr.io/canonical/tempest:2024.1
upstream-source: ghcr.io/canonical/tempest:2024.1
requires:
identity-ops:

2
common.sh
View File

@ -261,6 +261,8 @@ CONFIG_TEMPLATES_KEYSTONE=(
)
CONFIG_TEMPLATES_MAGNUM=(
"parts/section-database"
"parts/database-connection"
"parts/section-identity"
"parts/identity-data"
"parts/section-oslo-messaging-rabbit"

40
tests/caas/smoke.yaml.j2
View File

@ -49,15 +49,15 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:24.03
keystone:
{% if keystone_k8s is defined and keystone_k8s is sameas true -%}
charm: ../../../keystone-k8s.charm
{% else -%}
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -68,13 +68,13 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
glance:
{% if glance_k8s is defined and glance_k8s is sameas true -%}
charm: ../../../glance-k8s.charm
{% else -%}
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -82,60 +82,60 @@ applications:
storage:
local-repository: 5G
resources:
glance-api-image: ghcr.io/canonical/glance-api:2023.2
glance-api-image: ghcr.io/canonical/glance-api:2024.1
heat:
{% if heat_k8s is defined and heat_k8s is sameas true -%}
charm: ../../../heat-k8s.charm
{% else -%}
charm: ch:heat-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
heat-api-image: ghcr.io/canonical/heat-consolidated:2023.2
heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2
heat-api-image: ghcr.io/canonical/heat-consolidated:2024.1
heat-engine-image: ghcr.io/canonical/heat-consolidated:2024.1
octavia:
{% if octavia_k8s is defined and octavia_k8s is sameas true -%}
charm: ../../../octavia-k8s.charm
{% else -%}
charm: ch:octavia-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2024.1
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2024.1
barbican:
{% if barbican_k8s is defined and barbican_k8s is sameas true -%}
charm: ../../../barbican-k8s.charm
{% else -%}
charm: ch:barbican-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: false
resources:
barbican-api-image: ghcr.io/canonical/barbican-consolidated:2023.2
barbican-worker-image: ghcr.io/canonical/barbican-consolidated:2023.2
barbican-api-image: ghcr.io/canonical/barbican-consolidated:2024.1
barbican-worker-image: ghcr.io/canonical/barbican-consolidated:2024.1
magnum:
{% if magnum_k8s is defined and magnum_k8s is sameas true -%}
charm: ../../../magnum-k8s.charm
{% else -%}
charm: ch:magnum-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: false
resources:
magnum-api-image: ghcr.io/canonical/magnum-consolidated:2023.2
magnum-conductor-image: ghcr.io/canonical/magnum-consolidated:2023.2
magnum-api-image: ghcr.io/canonical/magnum-consolidated:2024.1
magnum-conductor-image: ghcr.io/canonical/magnum-consolidated:2024.1
relations:
- - tls-operator:certificates

34
tests/ceph/smoke.yaml.j2
View File

@ -29,7 +29,7 @@ applications:
charm: ../../../keystone-k8s.charm
{% else -%}
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -40,38 +40,38 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
cinder:
{% if cinder_k8s is defined and cinder_k8s is sameas true -%}
charm: ../../../cinder-k8s.charm
{% else -%}
charm: ch:cinder-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
cinder-api-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-scheduler-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-api-image: ghcr.io/canonical/cinder-consolidated:2024.1
cinder-scheduler-image: ghcr.io/canonical/cinder-consolidated:2024.1
cinder-ceph:
{% if cinder_ceph_k8s is defined and cinder_ceph_k8s is sameas true -%}
charm: ../../../cinder-ceph-k8s.charm
{% else -%}
charm: ch:cinder-ceph-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
cinder-volume-image: ghcr.io/canonical/cinder-consolidated:2023.2
cinder-volume-image: ghcr.io/canonical/cinder-consolidated:2024.1
gnocchi:
{% if gnocchi_k8s is defined and gnocchi_k8s is sameas true -%}
charm: ../../../gnocchi-k8s.charm
{% else -%}
charm: ch:gnocchi-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -84,30 +84,30 @@ applications:
charm: ../../../ceilometer-k8s.charm
{% else -%}
charm: ch:ceilometer-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
ceilometer-central-image: ghcr.io/canonical/ceilometer-consolidated:2023.2
ceilometer-notification-image: ghcr.io/canonical/ceilometer-consolidated:2023.2
ceilometer-central-image: ghcr.io/canonical/ceilometer-consolidated:2024.1
ceilometer-notification-image: ghcr.io/canonical/ceilometer-consolidated:2024.1
aodh:
{% if aodh_k8s is defined and aodh_k8s is sameas true -%}
charm: ../../../aodh-k8s.charm
{% else -%}
charm: ch:aodh-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
aodh-api-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-api-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2024.1
aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2024.1
relations:
- - mysql:database

32
tests/core/smoke.yaml.j2
View File

@ -42,9 +42,9 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-relay:
{% if ovn_relay_k8s is defined and ovn_relay_k8s is sameas true -%}
charm: ../../../ovn-relay-k8s.charm
@ -56,13 +56,13 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
keystone:
{% if keystone_k8s is defined and keystone_k8s is sameas true -%}
charm: ../../../keystone-k8s.charm
{% else -%}
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -73,13 +73,13 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
glance:
{% if glance_k8s is defined and glance_k8s is sameas true -%}
charm: ../../../glance-k8s.charm
{% else -%}
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -87,39 +87,39 @@ applications:
storage:
local-repository: 5G
resources:
glance-api-image: ghcr.io/canonical/glance-api:2023.2
glance-api-image: ghcr.io/canonical/glance-api:2024.1
nova:
{% if nova_k8s is defined and nova_k8s is sameas true -%}
charm: ../../../nova-k8s.charm
{% else -%}
charm: ch:nova-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
nova-api-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-api-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2024.1
placement:
{% if placement_k8s is defined and placement_k8s is sameas true -%}
charm: ../../../placement-k8s.charm
{% else -%}
charm: ch:placement-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
placement-api-image: ghcr.io/canonical/placement-api:2023.2
placement-api-image: ghcr.io/canonical/placement-api:2024.1
neutron:
{% if neutron_k8s is defined and neutron_k8s is sameas true -%}
charm: ../../../neutron-k8s.charm
{% else -%}
charm: ch:neutron-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -127,7 +127,7 @@ applications:
options:
debug: true
resources:
neutron-server-image: ghcr.io/canonical/neutron-server:2023.2
neutron-server-image: ghcr.io/canonical/neutron-server:2024.1
relations:
- - tls-operator:certificates

4
tests/machine/smoke.yaml.j2
View File

@ -4,7 +4,7 @@ applications:
charm: ../../../sunbeam-machine.charm
{% else -%}
charm: ch:sunbeam-machine
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
constraints: cores=1 mem=1G virt-type=virtual-machine
@ -14,7 +14,7 @@ applications:
charm: ../../../sunbeam-clusterd.charm
{% else -%}
charm: ch:sunbeam-clusterd
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
constraints: cores=1 mem=1G virt-type=virtual-machine

16
tests/misc/smoke.yaml.j2
View File

@ -34,7 +34,7 @@ applications:
charm: ../../../keystone-k8s.charm
{% else -%}
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -45,7 +45,7 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
designate-bind:
{% if designate_bind_k8s is defined and designate_bind_k8s is sameas true -%}
charm: ../../../designate-bind-k8s.charm
@ -63,19 +63,19 @@ applications:
charm: ../../../designate-k8s.charm
{% else -%}
charm: ch:designate-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: false
resources:
designate-image: ghcr.io/canonical/designate-consolidated:2023.2
designate-image: ghcr.io/canonical/designate-consolidated:2024.1
keystone-ldap:
{% if keystone_ldap_k8s is defined and keystone_ldap_k8s is sameas true -%}
charm: ../../../keystone-ldap-k8s.charm
{% else -%}
charm: ch:keystone-ldap-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -84,7 +84,7 @@ applications:
charm: ../../../openstack-exporter-k8s.charm
{% else -%}
charm: ch:openstack-exporter-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -95,13 +95,13 @@ applications:
charm: ../../../horizon-k8s.charm
{% else -%}
charm: ch:horizon-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
horizon-image: ghcr.io/canonical/horizon:2023.2
horizon-image: ghcr.io/canonical/horizon:2024.1
relations:
- - mysql:database

36
tests/tempest/smoke.yaml.j2
View File

@ -42,9 +42,9 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-nb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-northd-image: ghcr.io/canonical/ovn-consolidated:24.03
ovn-relay:
{% if ovn_relay_k8s is defined and ovn_relay_k8s is sameas true -%}
charm: ../../../ovn-relay-k8s.charm
@ -56,13 +56,13 @@ applications:
scale: 1
trust: true
resources:
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:23.09
ovn-sb-db-server-image: ghcr.io/canonical/ovn-consolidated:24.03
keystone:
{% if keystone_k8s is defined and keystone_k8s is sameas true -%}
charm: ../../../keystone-k8s.charm
{% else -%}
charm: ch:keystone-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -73,13 +73,13 @@ applications:
fernet-keys: 5M
credential-keys: 5M
resources:
keystone-image: ghcr.io/canonical/keystone:2023.2
keystone-image: ghcr.io/canonical/keystone:2024.1
glance:
{% if glance_k8s is defined and glance_k8s is sameas true -%}
charm: ../../../glance-k8s.charm
{% else -%}
charm: ch:glance-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -87,39 +87,39 @@ applications:
storage:
local-repository: 5G
resources:
glance-api-image: ghcr.io/canonical/glance-api:2023.2
glance-api-image: ghcr.io/canonical/glance-api:2024.1
nova:
{% if nova_k8s is defined and nova_k8s is sameas true -%}
charm: ../../../nova-k8s.charm
{% else -%}
charm: ch:nova-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
nova-api-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2023.2
nova-api-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2024.1
nova-conductor-image: ghcr.io/canonical/nova-consolidated:2024.1
placement:
{% if placement_k8s is defined and placement_k8s is sameas true -%}
charm: ../../../placement-k8s.charm
{% else -%}
charm: ch:placement-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
placement-api-image: ghcr.io/canonical/placement-api:2023.2
placement-api-image: ghcr.io/canonical/placement-api:2024.1
neutron:
{% if neutron_k8s is defined and neutron_k8s is sameas true -%}
charm: ../../../neutron-k8s.charm
{% else -%}
charm: ch:neutron-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
@ -127,19 +127,19 @@ applications:
options:
debug: true
resources:
neutron-server-image: ghcr.io/canonical/neutron-server:2023.2
neutron-server-image: ghcr.io/canonical/neutron-server:2024.1
tempest:
{% if tempest_k8s is defined and tempest_k8s is sameas true -%}
charm: ../../../tempest-k8s.charm
{% else -%}
charm: ch:tempest-k8s
channel: 2023.2/edge
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
tempest-image: ghcr.io/canonical/tempest:2023.2
tempest-image: ghcr.io/canonical/tempest:2024.1
relations:
- - tls-operator:certificates

48
zuul.d/zuul.yaml
View File

@ -26,28 +26,28 @@
charmcraft_channel: 2.x/stable
publish_charm: true
publish_channels:
keystone-k8s: 2023.2/edge
glance-k8s: 2023.2/edge
nova-k8s: 2023.2/edge
placement-k8s: 2023.2/edge
neutron-k8s: 2023.2/edge
ovn-central-k8s: 23.09/edge
ovn-relay-k8s: 23.09/edge
cinder-k8s: 2023.2/edge
cinder-ceph-k8s: 2023.2/edge
horizon-k8s: 2023.2/edge
heat-k8s: 2023.2/edge
octavia-k8s: 2023.2/edge
aodh-k8s: 2023.2/edge
ceilometer-k8s: 2023.2/edge
gnocchi-k8s: 2023.2/edge
barbican-k8s: 2023.2/edge
designate-k8s: 2023.2/edge
keystone-k8s: 2024.1/edge
glance-k8s: 2024.1/edge
nova-k8s: 2024.1/edge
placement-k8s: 2024.1/edge
neutron-k8s: 2024.1/edge
ovn-central-k8s: 24.03/edge
ovn-relay-k8s: 24.03/edge
cinder-k8s: 2024.1/edge
cinder-ceph-k8s: 2024.1/edge
horizon-k8s: 2024.1/edge
heat-k8s: 2024.1/edge
octavia-k8s: 2024.1/edge
aodh-k8s: 2024.1/edge
ceilometer-k8s: 2024.1/edge
gnocchi-k8s: 2024.1/edge
barbican-k8s: 2024.1/edge
designate-k8s: 2024.1/edge
designate-bind-k8s: 9/edge
magnum-k8s: 2023.2/edge
keystone-ldap-k8s: 2023.2/edge
openstack-exporter-k8s: 2023.2/edge
openstack-hypervisor: 2023.2/edge
sunbeam-machine: 2023.2/edge
sunbeam-clusterd: 2023.2/edge
tempest-k8s: 2023.2/edge
magnum-k8s: 2024.1/edge
keystone-ldap-k8s: 2024.1/edge
openstack-exporter-k8s: 2024.1/edge
openstack-hypervisor: 2024.1/edge
sunbeam-machine: 2024.1/edge
sunbeam-clusterd: 2024.1/edge
tempest-k8s: 2024.1/edge