Fixes for ceph squid

Make caracal the default source. Add python3-packaging package as a
tactical fix for bug #2064717. Add a local caracal functest.

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1209

Change-Id: I1328d2c6221c77bfe0f2420af770cc5064394c57
This commit is contained in:
Peter Sabaini 2024-05-10 11:13:34 +02:00
parent 1a76572ebe
commit a465929ece
6 changed files with 18 additions and 17 deletions

View File

@ -1,5 +1,4 @@
- project:
templates:
- openstack-python3-charm-yoga-jobs
- openstack-python3-charm-jobs
- openstack-cover-jobs

View File

@ -5,7 +5,7 @@ options:
description: OSD debug level. Max is 20.
source:
type: string
default: bobcat
default: caracal
description: |
Optional configuration to support use of additional sources such as:
.

View File

@ -321,7 +321,11 @@ def install_udev_rules():
def install():
add_source(config('source'), config('key'))
apt_update(fatal=True)
apt_install(packages=ceph.determine_packages(), fatal=True)
packages = ceph.determine_packages()
# TODO(chrome0): temp. fix for bug #2064717; remove once this has been
# fixed
packages.append('python3-packaging')
apt_install(packages=packages, fatal=True)
if config('autotune'):
log('The autotune config is deprecated and planned '
'for removal in the next release.', level=WARNING)

View File

@ -10,13 +10,13 @@
charmcraft_channel: 2.x/stable
check:
jobs:
- new-install-jammy-antelope
- new-install-jammy-caracal
- job:
name: new-install-jammy-antelope
name: new-install-jammy-caracal
parent: func-target
dependencies:
- osci-lint
- charm-build
- tox-py38
vars:
tox_extra_args: '-- install:local-jammy-antelope'
tox_extra_args: '-- install:local-jammy-caracal'

View File

@ -1,5 +1,5 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-antelope
openstack-origin: &openstack-origin cloud:jammy-caracal
series: jammy
@ -94,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: 2023.1/edge
channel: latest/edge
nova-compute:
charm: ch:nova-compute
@ -103,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: 2023.1/edge
channel: latest/edge
glance:
expose: True
@ -113,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: 2023.1/edge
channel: latest/edge
cinder:
expose: True
@ -125,11 +125,11 @@ applications:
glance-api-version: '2'
to:
- '13'
channel: 2023.1/edge
channel: latest/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: 2023.1/edge
channel: latest/edge
nova-cloud-controller:
expose: True
@ -139,7 +139,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: 2023.1/edge
channel: latest/edge
placement:
charm: ch:placement
@ -148,7 +148,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: 2023.1/edge
channel: latest/edge
relations:
- - 'nova-compute:amqp'

View File

@ -1,14 +1,12 @@
charm_name: ceph-osd
gate_bundles:
- focal-xena
- focal-yoga
- jammy-yoga
- jammy-bobcat
- jammy-caracal
smoke_bundles:
- jammy-antelope
- jammy-caracal
configure:
- install: