openstack
/
charm-glance
Code Issues Proposed changes

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: If2944411e04d21448f518b701f74a35ae39cd20e
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 59efce8bc8
commit e65eaf3151
10 changed files with 61 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

@ -31,9 +31,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.10"
architectures: [amd64, s390x, ppc64el, arm64]

3
charmhelpers/contrib/openstack/context.py
View File

@ -545,7 +545,7 @@ class IdentityServiceContext(OSContextGenerator):
'internal_auth_url': internal_auth_url,
})
# we keep all veriables in ctxt for compatibility and
# we keep all variables in ctxt for compatibility and
# add nested dictionary for keystone_authtoken generic
# templating
if keystonemiddleware_os_release:
@ -557,6 +557,7 @@ class IdentityServiceContext(OSContextGenerator):
# NOTE(jamespage) this is required for >= icehouse
# so a missing value just indicates keystone needs
# upgrading
ctxt['admin_user_id'] = _resolve('service_user_id')
ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
ctxt['admin_domain_id'] = _resolve('service_domain_id')
return ctxt

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

@ -161,6 +161,7 @@ OPENSTACK_CODENAMES = OrderedDict([
('2022.2', 'zed'),
('2023.1', 'antelope'),
('2023.2', 'bobcat'),
('2024.1', 'caracal'),
])
# The ugly duckling - must list releases oldest to newest
@ -416,17 +417,6 @@ def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES,
error_out(e)
def get_os_version_codename_swift(codename):
'''Determine OpenStack version number of swift from codename.'''
# for k, v in six.iteritems(SWIFT_CODENAMES):
for k, v in SWIFT_CODENAMES.items():
if k == codename:
return v[-1]
e = 'Could not derive swift version for '\
'codename: %s' % codename
error_out(e)
def get_swift_codename(version):
'''Determine OpenStack codename that corresponds to swift version.'''
codenames = [k for k, v in SWIFT_CODENAMES.items() if version in v]
@ -585,7 +575,6 @@ def get_installed_os_version():
return openstack_release().get('OPENSTACK_CODENAME')
@cached
def openstack_release():
"""Return /etc/os-release in a dict."""
d = {}
@ -847,14 +836,10 @@ def openstack_upgrade_available(package):
if not cur_vers:
# The package has not been installed yet do not attempt upgrade
return False
if "swift" in package:
codename = get_os_codename_install_source(src)
avail_vers = get_os_version_codename_swift(codename)
else:
try:
avail_vers = get_os_version_install_source(src)
except Exception:
avail_vers = cur_vers
try:
avail_vers = get_os_version_install_source(src)
except Exception:
avail_vers = cur_vers
apt.init()
return apt.version_compare(avail_vers, cur_vers) >= 1

10
charmhelpers/fetch/ubuntu.py
View File

@ -246,6 +246,14 @@ CLOUD_ARCHIVE_POCKETS = {
'bobcat/proposed': 'jammy-proposed/bobcat',
'jammy-bobcat/proposed': 'jammy-proposed/bobcat',
'jammy-proposed/bobcat': 'jammy-proposed/bobcat',
# caracal
'caracal': 'jammy-updates/caracal',
'jammy-caracal': 'jammy-updates/caracal',
'jammy-caracal/updates': 'jammy-updates/caracal',
'jammy-updates/caracal': 'jammy-updates/caracal',
'caracal/proposed': 'jammy-proposed/caracal',
'jammy-caracal/proposed': 'jammy-proposed/caracal',
'jammy-proposed/caracal': 'jammy-proposed/caracal',
# OVN
'focal-ovn-22.03': 'focal-updates/ovn-22.03',
@ -279,6 +287,7 @@ OPENSTACK_RELEASES = (
'zed',
'antelope',
'bobcat',
'caracal',
)
@ -308,6 +317,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
('kinetic', 'zed'),
('lunar', 'antelope'),
('mantic', 'bobcat'),
('noble', 'caracal'),
])

10
metadata.yaml
View File

@ -8,13 +8,11 @@ description: |
service, to Nova's compute nodes.
docs: https://discourse.charmhub.io/t/glance-docs-index/10553
tags:
- openstack
- storage
- misc
- openstack
- storage
- misc
series:
- jammy
- lunar
- mantic
- jammy
extra-bindings:
public:
admin:

12
tests/bundles/jammy-antelope.yaml
View File

@ -62,7 +62,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -71,7 +71,7 @@ applications:
source: *openstack-origin
to:
- '15'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -83,7 +83,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -100,7 +100,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
glance:
expose: True
@ -127,7 +127,7 @@ applications:
block-device: None
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
cinder-lvm:
charm: ch:cinder-lvm
@ -138,7 +138,7 @@ applications:
ephemeral-unmount: /mnt
allocation-type: auto
config-flags: target_helper=lioadm
channel: latest/edge
channel: 2024.1/edge
relations:
- - 'keystone:shared-db'

12
tests/bundles/jammy-bobcat.yaml
View File

@ -62,7 +62,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -71,7 +71,7 @@ applications:
source: *openstack-origin
to:
- '15'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -83,7 +83,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -100,7 +100,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
glance:
expose: True
@ -127,7 +127,7 @@ applications:
block-device: None
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
cinder-lvm:
charm: ch:cinder-lvm
@ -138,7 +138,7 @@ applications:
ephemeral-unmount: /mnt
allocation-type: auto
config-flags: target_helper=lioadm
channel: latest/edge
channel: 2024.1/edge
relations:
- - 'keystone:shared-db'

16
tests/bundles/mantic-bobcat.yaml → tests/bundles/jammy-caracal.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
series: mantic
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -62,7 +62,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -71,7 +71,7 @@ applications:
source: *openstack-origin
to:
- '15'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -83,7 +83,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -100,7 +100,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
glance:
expose: True
@ -127,7 +127,7 @@ applications:
block-device: None
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
cinder-lvm:
charm: ch:cinder-lvm
@ -138,7 +138,7 @@ applications:
ephemeral-unmount: /mnt
allocation-type: auto
config-flags: target_helper=lioadm
channel: latest/edge
channel: 2024.1/edge
relations:
- - 'keystone:shared-db'

14
tests/bundles/lunar-antelope.yaml → tests/bundles/noble-caracal.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -62,7 +62,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -71,7 +71,7 @@ applications:
source: *openstack-origin
to:
- '15'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -83,7 +83,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -100,7 +100,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
glance:
expose: True
@ -127,7 +127,7 @@ applications:
block-device: None
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
cinder-lvm:
charm: ch:cinder-lvm
@ -138,7 +138,7 @@ applications:
ephemeral-unmount: /mnt
allocation-type: auto
config-flags: target_helper=lioadm
channel: latest/edge
channel: 2024.1/edge
relations:
- - 'keystone:shared-db'

30
tests/tests.yaml
View File

@ -4,25 +4,22 @@ comment:
- 'the glance configure job validates operation of identity-service relation'
smoke_bundles:
- jammy-antelope
- jammy-caracal
gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-caracal
dev_bundles:
- noble-caracal
configure:
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.glance.setup.configure_external_s3_backend
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- full_run:
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
tests:
- zaza.openstack.charm_tests.glance.tests.GlanceTest
@ -33,16 +30,15 @@ tests:
- zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
- zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
- full_run:
- zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
- zaza.openstack.charm_tests.glance.tests.GlanceTest
- zaza.openstack.charm_tests.policyd.tests.GlanceTests
- zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
- zaza.openstack.charm_tests.glance.tests.GlanceTest
- zaza.openstack.charm_tests.policyd.tests.GlanceTests
tests_options:
tempest:
full_run:
smoke: True
smoke: true
policyd:
service: glance
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal