openstack/charm-ceph-radosgw
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: I05ce01c13efdd453c06e3c8d615d64bad6e27727
This commit is contained in:
Chris MacNaughton 2023-03-20 08:42:13 -04:00
parent 1fff8f052b
commit a1267f4919
9 changed files with 546 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -1,3 +1,4 @@
- project:
templates:
- openstack-python3-charm-zed-jobs
- openstack-python3-charm-jobs

3
charmcraft.yaml
View File

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

64
osci.yaml
View File

@ -11,18 +11,30 @@
- jammy-yoga-multisite
- jammy-zed-multisite:
voting: false
- jammy-antelope-multisite:
voting: false
- kinetic-zed-multisite:
voting: false
- lunar-antelope-multisite:
voting: false
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
- vault-jammy-zed_rgw:
voting: false
- vault-jammy-zed-namespaced:
voting: false
- vault-jammy-antelope_rgw:
voting: false
- vault-jammy-antelope-namespaced:
voting: false
- vault-kinetic-zed_rgw:
voting: false
- vault-kinetic-zed-namespaced:
voting: false
- vault-lunar-antelope_rgw:
voting: false
- vault-lunar-antelope-namespaced:
voting: false
vars:
needs_charm_build: true
charm_build_name: ceph-radosgw
@ -57,6 +69,13 @@
- jammy-yoga-multisite
vars:
tox_extra_args: '-- jammy-zed-multisite'
- job:
name: jammy-antelope-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- jammy-antelope-multisite'
- job:
name: kinetic-zed-multisite
parent: func-target
@ -64,6 +83,13 @@
- jammy-yoga-multisite
vars:
tox_extra_args: '-- kinetic-zed-multisite'
- job:
name: lunar-antelope-multisite
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- lunar-antelope-multisite'
- job:
name: vault-focal-yoga_rgw
parent: func-target
@ -92,6 +118,20 @@
- jammy-yoga-multisite
vars:
tox_extra_args: '-- vault:jammy-yoga-namespaced'
- job:
name: vault-jammy-zed-namespaced
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- vault:jammy-zed-namespaced'
- job:
name: vault-jammy-antelope-namespaced
parent: func-target
dependencies:
- jammy-yoga-multisite
vars:
tox_extra_args: '-- vault:jammy-antelope-namespaced'
- job:
name: vault-jammy-zed_rgw
parent: func-target
@ -124,3 +164,27 @@
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:kinetic-zed-namespaced'
- job:
name: vault-jammy-antelope_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:jammy-antelope'
- job:
name: vault-lunar-antelope_rgw
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:lunar-antelope'
- job:
name: vault-lunar-antelope-namespaced
parent: func-target
dependencies:
- vault-jammy-yoga_rgw
- vault-jammy-yoga-namespaced
vars:
tox_extra_args: '-- vault:lunar-antelope-namespaced'

99
tests/bundles/jammy-antelope-multisite.yaml Normal file
View File

@ -0,0 +1,99 @@
options:
source: &source cloud:jammy-antelope
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
'9':
applications:
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '0'
secondary-ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '1'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '2'
- '6'
- '7'
channel: latest/edge
secondary-ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '3'
- '8'
- '9'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '4'
channel: latest/edge
secondary-ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '5'
channel: latest/edge
relations:
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'secondary-ceph-osd:mon'
- 'secondary-ceph-mon:osd'
- - 'secondary-ceph-radosgw:mon'
- 'secondary-ceph-mon:radosgw'

124
tests/bundles/jammy-antelope-namespaced.yaml Normal file
View File

@ -0,0 +1,124 @@
options:
source: &source cloud:jammy-antelope
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
namespace-tenants: True
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

123
tests/bundles/jammy-antelope.yaml Normal file
View File

@ -0,0 +1,123 @@
options:
source: &source cloud:jammy-antelope
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

123
tests/bundles/lunar-antelope.yaml Normal file
View File

@ -0,0 +1,123 @@
options:
source: &source cloud:lunar-antelope
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: latest/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

8
tests/tests.yaml
View File

@ -15,13 +15,19 @@ smoke_bundles:
dev_bundles:
- jammy-yoga-multisite
- jammy-zed-multisite
- lunar-antelope-multisite
- kinetic-zed-multisite
- jammy-antelope-multisite
- vault: jammy-yoga
- vault: jammy-yoga-namespaced
- vault: jammy-zed
- vault: lunar-antelope
- vault: jammy-zed-namespaced
- vault: lunar-antelope-namespaced
- vault: kinetic-zed
- vault: jammy-antelope
- vault: kinetic-zed-namespaced
- vault: jammy-antelope-namespaced
target_deploy_status:
vault:
@ -43,4 +49,6 @@ tests:
tests_options:
force_deploy:
- kinetic-zed
- jammy-antelope
- kinetic-zed-namespaced
- jammy-antelope-namespaced

2
tox.ini
View File

@ -25,7 +25,7 @@ setenv = VIRTUAL_ENV={envdir}
commands = stestr run --slowest {posargs}
allowlist_externals =
charmcraft
rename.sh
{toxinidir}/rename.sh
passenv =
HOME
TERM