openstack/charm-cinder
Code Issues Proposed changes

Sync/rebuild for Dalmatian/Epoxy updates

Browse Source 
Refresh and rebuild charm for awareness of Dalmatian and Epoxy
Cloud Archive releases.

Change-Id: If5b02414bfd490d3fe0a92182aa5611c1bfaa475
This commit is contained in:
James Page 2024-11-15 12:09:41 +00:00
parent 25a64a37ba
commit e95e788ed1
No known key found for this signature in database
GPG Key ID: BFECAECBA0E7D8C3
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmhelpers/contrib/openstack/utils.py
View File

@ -162,6 +162,8 @@ OPENSTACK_CODENAMES = OrderedDict([
('2023.1', 'antelope'),
('2023.2', 'bobcat'),
('2024.1', 'caracal'),
('2024.2', 'dalmatian'),
('2025.1', 'epoxy'),
])
# The ugly duckling - must list releases oldest to newest

5
charmhelpers/core/hookenv.py
View File

@ -18,7 +18,10 @@
# Charm Helpers Developers <juju@lists.ubuntu.com>
import copy
from distutils.version import LooseVersion
try:
from distutils.version import LooseVersion
except ImportError:
from looseversion import LooseVersion
from enum import Enum
from functools import wraps
from collections import namedtuple, UserDict

20
charmhelpers/fetch/ubuntu.py
View File

@ -254,6 +254,22 @@ CLOUD_ARCHIVE_POCKETS = {
'caracal/proposed': 'jammy-proposed/caracal',
'jammy-caracal/proposed': 'jammy-proposed/caracal',
'jammy-proposed/caracal': 'jammy-proposed/caracal',
# dalmatian
'dalmatian': 'noble-updates/dalmatian',
'noble-dalmatian': 'noble-updates/dalmatian',
'noble-dalmatian/updates': 'noble-updates/dalmatian',
'noble-updates/dalmatian': 'noble-updates/dalmatian',
'dalmatian/proposed': 'noble-proposed/dalmatian',
'noble-dalmatian/proposed': 'noble-proposed/dalmatian',
'noble-proposed/dalmatian': 'noble-proposed/dalmatian',
# epoxy
'epoxy': 'noble-updates/epoxy',
'noble-epoxy': 'noble-updates/epoxy',
'noble-epoxy/updates': 'noble-updates/epoxy',
'noble-updates/epoxy': 'noble-updates/epoxy',
'epoxy/proposed': 'noble-proposed/epoxy',
'noble-epoxy/proposed': 'noble-proposed/epoxy',
'noble-proposed/epoxy': 'noble-proposed/epoxy',
# OVN
'focal-ovn-22.03': 'focal-updates/ovn-22.03',
@ -288,6 +304,8 @@ OPENSTACK_RELEASES = (
'antelope',
'bobcat',
'caracal',
'dalmatian',
'epoxy',
)
@ -318,6 +336,8 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
('lunar', 'antelope'),
('mantic', 'bobcat'),
('noble', 'caracal'),
('oracular', 'dalmatian'),
('plucky', 'epoxy'),
])