openstack/charm-ceph-iscsi
Code Issues Proposed changes

Add support for interim Ubuntu releases

Browse Source 
- update bundles to include UCA pocket tests
- update test configuration
- update metadata to include kinetic and lunar
- update snapcraft to allow run-on for kinetic and lunar

Change-Id: I70e902b52058b1e3ed6e3918b33ccb571eb0aa65
This commit is contained in:
Luciano Lo Giudice 2023-03-15 19:52:36 -03:00 committed by Chris MacNaughton
parent 6c125f663a
commit f31543f04b
7 changed files with 221 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

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

6
charmcraft.yaml
View File

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

2
config.yaml
View File

@ -5,7 +5,7 @@ options:
description: Mon and OSD debug level. Max is 20.
source:
type: string
default: zed
default: distro
description: |
Optional configuration to support use of additional sources such as:
- ppa:myteam/ppa

2
metadata.yaml
View File

@ -11,6 +11,8 @@ tags:
- misc
series:
- jammy
- kinetic
- lunar
subordinate: false
min-juju-version: 2.7.6
extra-bindings:

21
osci.yaml
View File

@ -9,6 +9,10 @@
voting: false
- ceph-iscsi-kinetic-quincy-ec:
voting: false
- ceph-iscsi-lunar-quincy:
voting: false
- ceph-iscsi-lunar-quincy-ec:
voting: false
vars:
needs_charm_build: true
charm_build_name: ceph-iscsi
@ -45,3 +49,20 @@
- ceph-iscsi-jammy-quincy
vars:
tox_extra_args: -- kinetic-ec
- job:
name: ceph-iscsi-lunar-quincy
parent: func-target
voting: false
dependencies:
- ceph-iscsi-jammy-quincy
vars:
tox_extra_args: -- lunar
- job:
name: ceph-iscsi-lunar-quincy-ec
parent: func-target
voting: false
dependencies:
- ceph-iscsi-jammy-quincy
vars:
tox_extra_args: -- lunar-ec

94
tests/bundles/lunar-ec.yaml Normal file
View File

@ -0,0 +1,94 @@
local_overlay_enabled: False
series: lunar
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: mem=3072M
'9':
constraints: mem=3072M
'10':
constraints: mem=3072M
'11':
'12':
'13':
'14':
'15':
applications:
ubuntu:
charm: cs:ubuntu
num_units: 3
to:
- '7'
- '14'
- '15'
ceph-iscsi:
charm: ../../ceph-iscsi.charm
num_units: 2
options:
gateway-metadata-pool: iscsi-foo-metadata
pool-type: erasure-coded
ec-profile-k: 4
ec-profile-m: 2
to:
- '0'
- '1'
ceph-osd:
charm: ch:ceph-osd
num_units: 6
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
to:
- '0'
- '1'
- '2'
- '11'
- '12'
- '13'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
monitor-count: '3'
to:
- '3'
- '4'
- '5'
channel: latest/edge
vault:
num_units: 1
charm: ch:vault
to:
- '6'
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '8'
- '9'
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
relations:
- - 'ceph-mon:client'
- 'ceph-iscsi:ceph-client'
- - 'vault:certificates'
- 'ceph-iscsi:certificates'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

95
tests/bundles/lunar.yaml Normal file
View File

@ -0,0 +1,95 @@
local_overlay_enabled: False
series: lunar
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: mem=3072M
'9':
constraints: mem=3072M
'10':
constraints: mem=3072M
'11':
'12':
'13':
'14':
'15':
'16':
'17':
applications:
ubuntu:
charm: cs:ubuntu
num_units: 3
to:
- '7'
- '14'
- '15'
ceph-iscsi:
charm: ../../ceph-iscsi.charm
num_units: 4
options:
gateway-metadata-pool: iscsi-foo-metadata
to:
- '0'
- '1'
- '16'
- '17'
ceph-osd:
charm: ch:ceph-osd
num_units: 6
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
to:
- '0'
- '1'
- '2'
- '11'
- '12'
- '13'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
monitor-count: '3'
to:
- '3'
- '4'
- '5'
channel: latest/edge
vault:
num_units: 1
charm: ch:vault
to:
- '6'
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '8'
- '9'
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
relations:
- - 'ceph-mon:client'
- 'ceph-iscsi:ceph-client'
- - 'vault:certificates'
- 'ceph-iscsi:certificates'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'