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:
parent
1a76572ebe
commit
a465929ece
@ -1,5 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
|
||||||
- openstack-python3-charm-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
@ -5,7 +5,7 @@ options:
|
|||||||
description: OSD debug level. Max is 20.
|
description: OSD debug level. Max is 20.
|
||||||
source:
|
source:
|
||||||
type: string
|
type: string
|
||||||
default: bobcat
|
default: caracal
|
||||||
description: |
|
description: |
|
||||||
Optional configuration to support use of additional sources such as:
|
Optional configuration to support use of additional sources such as:
|
||||||
.
|
.
|
||||||
|
@ -321,7 +321,11 @@ def install_udev_rules():
|
|||||||
def install():
|
def install():
|
||||||
add_source(config('source'), config('key'))
|
add_source(config('source'), config('key'))
|
||||||
apt_update(fatal=True)
|
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'):
|
if config('autotune'):
|
||||||
log('The autotune config is deprecated and planned '
|
log('The autotune config is deprecated and planned '
|
||||||
'for removal in the next release.', level=WARNING)
|
'for removal in the next release.', level=WARNING)
|
||||||
|
@ -10,13 +10,13 @@
|
|||||||
charmcraft_channel: 2.x/stable
|
charmcraft_channel: 2.x/stable
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- new-install-jammy-antelope
|
- new-install-jammy-caracal
|
||||||
- job:
|
- job:
|
||||||
name: new-install-jammy-antelope
|
name: new-install-jammy-caracal
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies:
|
dependencies:
|
||||||
- osci-lint
|
- osci-lint
|
||||||
- charm-build
|
- charm-build
|
||||||
- tox-py38
|
- tox-py38
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: '-- install:local-jammy-antelope'
|
tox_extra_args: '-- install:local-jammy-caracal'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:jammy-antelope
|
openstack-origin: &openstack-origin cloud:jammy-caracal
|
||||||
|
|
||||||
series: jammy
|
series: jammy
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
expose: True
|
expose: True
|
||||||
@ -113,7 +113,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
expose: True
|
expose: True
|
||||||
@ -125,11 +125,11 @@ applications:
|
|||||||
glance-api-version: '2'
|
glance-api-version: '2'
|
||||||
to:
|
to:
|
||||||
- '13'
|
- '13'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: ch:cinder-ceph
|
charm: ch:cinder-ceph
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
expose: True
|
expose: True
|
||||||
@ -139,7 +139,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '14'
|
- '14'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
@ -148,7 +148,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '15'
|
- '15'
|
||||||
channel: 2023.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'nova-compute:amqp'
|
- - 'nova-compute:amqp'
|
@ -1,14 +1,12 @@
|
|||||||
charm_name: ceph-osd
|
charm_name: ceph-osd
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- focal-xena
|
|
||||||
- focal-yoga
|
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
- jammy-bobcat
|
- jammy-bobcat
|
||||||
- jammy-caracal
|
- jammy-caracal
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-antelope
|
- jammy-caracal
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- install:
|
- install:
|
||||||
|
Loading…
Reference in New Issue
Block a user