openstack/charm-ceph-radosgw
Code Issues Proposed changes

Add charmcraft 3 support

Browse Source 
Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update osci.yaml to use the charmcraft 3.x/beta
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: I34324235b9b839d9c888a80c70243ef27d49da99
This commit is contained in:
Billy Olsen 2024-06-21 13:33:51 -07:00 committed by Felipe Reyes
parent 435d49cb9c
commit 20299b0627
17 changed files with 50 additions and 1210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
charmcraft.yaml
View File

@ -4,32 +4,18 @@ parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
base: ubuntu@24.04
platforms:
amd64:
build-on: amd64
build-for: amd64
arm64:
build-on: arm64
build-for: arm64
ppc64el:
build-on: ppc64el
build-for: ppc64el
s390x:
build-on: s390x
build-for: s390x

2
hooks/charmhelpers/core/host_factory/ubuntu.py
View File

@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
'kinetic',
'lunar',
'mantic',
'noble',
'oracular',
)

110
osci.yaml
View File

@ -1,118 +1,22 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
check:
jobs:
- vault-focal-yoga_rgw
- vault-focal-yoga-namespaced
- focal-yoga-multisite
- jammy-antelope-multisite:
voting: false
- jammy-bobcat-multisite:
voting: false
- mantic-bobcat-multisite:
voting: false
- vault-jammy-antelope_rgw:
voting: false
- vault-jammy-antelope-namespaced:
voting: false
- vault-jammy-bobcat_rgw:
voting: false
- vault-jammy-bobcat-namespaced:
voting: false
- vault-mantic-bobcat_rgw:
voting: false
- vault-mantic-bobcat-namespaced:
voting: false
- vault-noble-caracal_rgw
- vault-noble-caracal-namespaced
vars:
needs_charm_build: true
charm_build_name: ceph-radosgw
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/beta
- job:
name: focal-yoga-multisite
name: vault-noble-caracal-namespaced
parent: func-target
dependencies:
- osci-lint
- charm-build
- tox-py38
vars:
tox_extra_args: '-- focal-yoga-multisite'
tox_extra_args: '-- vault:noble-caracal-namespaced'
- job:
name: jammy-antelope-multisite
name: vault-noble-caracal_rgw
parent: func-target
dependencies:
- focal-yoga-multisite
vars:
tox_extra_args: '-- jammy-antelope-multisite'
- job:
name: jammy-bobcat-multisite
parent: func-target
dependencies:
- jammy-antelope-multisite
vars:
tox_extra_args: '-- jammy-bobcat-multisite'
- job:
name: mantic-bobcat-multisite
parent: func-target
dependencies:
- jammy-antelope-multisite
vars:
tox_extra_args: '-- mantic-bobcat-multisite'
- job:
name: vault-focal-yoga_rgw
parent: func-target
dependencies:
- focal-yoga-multisite
vars:
tox_extra_args: '-- vault:focal-yoga'
- job:
name: vault-focal-yoga-namespaced
parent: func-target
dependencies:
- focal-yoga-multisite
vars:
tox_extra_args: '-- vault:focal-yoga-namespaced'
- job:
name: vault-jammy-antelope-namespaced
parent: func-target
dependencies:
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-antelope-namespaced'
- job:
name: vault-jammy-bobcat-namespaced
parent: func-target
dependencies:
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-bobcat-namespaced'
- job:
name: vault-jammy-antelope_rgw
parent: func-target
dependencies:
- jammy-antelope-multisite
vars:
tox_extra_args: '-- vault:jammy-antelope'
- job:
name: vault-jammy-bobcat_rgw
parent: func-target
dependencies:
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:jammy-bobcat'
- job:
name: vault-mantic-bobcat-namespaced
parent: func-target
dependencies:
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:mantic-bobcat-namespaced'
- job:
name: vault-mantic-bobcat_rgw
parent: func-target
dependencies:
- vault-jammy-antelope_rgw
vars:
tox_extra_args: '-- vault:mantic-bobcat'
tox_extra_args: '-- vault:noble-caracal'

99
tests/bundles/focal-yoga-multisite.yaml
View File

@ -1,99 +0,0 @@
options:
source: &source cloud:focal-yoga
series: focal
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: quincy/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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '4'
channel: quincy/edge
secondary-ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '5'
channel: quincy/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/focal-yoga-namespaced.yaml
View File

@ -1,124 +0,0 @@
options:
source: &source cloud:focal-yoga
series: focal
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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: quincy/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: yoga/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'

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

@ -1,99 +0,0 @@
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: quincy/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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '4'
channel: quincy/edge
secondary-ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '5'
channel: quincy/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'

125
tests/bundles/jammy-antelope-namespaced.yaml
View File

@ -1,125 +0,0 @@
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: ch:ceph-radosgw
channel: quincy/edge
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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: quincy/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: 2023.1/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'

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

@ -1,122 +0,0 @@
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: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: 8.0/edge
ceph-radosgw:
charm: ch:ceph-radosgw
channel: quincy/edge
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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: quincy/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: 2023.1/edge
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: 1.8/stable
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'

99
tests/bundles/jammy-bobcat-multisite.yaml
View File

@ -1,99 +0,0 @@
options:
source: &source cloud:jammy-bobcat
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: reef/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: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '4'
channel: reef/edge
secondary-ceph-mon:
charm: ch:ceph-mon
num_units: 1
options:
monitor-count: 1
source: *source
to:
- '5'
channel: reef/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'

125
tests/bundles/jammy-bobcat-namespaced.yaml
View File

@ -1,125 +0,0 @@
options:
source: &source cloud:jammy-bobcat
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: ch:ceph-radosgw
channel: reef/edge
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: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: reef/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: 2023.2/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'

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

@ -1,124 +0,0 @@
options:
source: &source cloud:jammy-bobcat
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: ch:ceph-radosgw
channel: reef/edge
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: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: reef/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: 2023.2/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'

121
tests/bundles/local-jammy-antelope.yaml
View File

@ -1,121 +0,0 @@
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: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: 8.0/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: quincy/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
channel: quincy/edge
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
channel: 2023.1/edge
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: 1.8/stable
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'

12
tests/bundles/focal-yoga.yaml → tests/bundles/local-noble-caracal.yaml
View File

@ -1,7 +1,7 @@
options:
source: &source cloud:focal-yoga
source: &source distro
series: focal
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -31,8 +31,6 @@ applications:
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
@ -60,7 +58,7 @@ applications:
- '4'
- '5'
- '6'
channel: quincy/edge
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
@ -71,7 +69,7 @@ applications:
- '7'
- '8'
- '9'
channel: quincy/edge
channel: latest/edge
keystone:
expose: True
@ -81,7 +79,7 @@ applications:
openstack-origin: *source
to:
- '10'
channel: yoga/edge
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router

4
tests/bundles/jammy-caracal-multisite.yaml → tests/bundles/noble-caracal-multisite.yaml
View File

@ -1,7 +1,7 @@
options:
source: &source cloud:jammy-caracal
source: &source distro
series: jammy
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'

12
tests/bundles/jammy-caracal-namespaced.yaml → tests/bundles/noble-caracal-namespaced.yaml
View File

@ -1,7 +1,7 @@
options:
source: &source cloud:jammy-caracal
source: &source distro
series: jammy
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0/edge
channel: latest/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -87,14 +87,14 @@ applications:
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: 1.8/edge
channel: latest/edge
relations:

12
tests/bundles/jammy-caracal.yaml → tests/bundles/noble-caracal.yaml
View File

@ -1,7 +1,7 @@
options:
source: &source cloud:jammy-caracal
source: &source distro
series: jammy
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0/edge
channel: latest/edge
ceph-radosgw:
charm: ch:ceph-radosgw
@ -86,14 +86,14 @@ applications:
vault-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: 1.8/edge
channel: latest/edge
relations:

28
tests/tests.yaml
View File

@ -1,24 +1,18 @@
charm_name: ceph-radosgw
gate_bundles:
- focal-yoga-multisite
- vault: focal-yoga
- vault: focal-yoga-namespaced
- noble-caracal-multisite
- vault: noble-caracal
- vault: noble-caracal-namespaced
smoke_bundles:
- jammy-antelope-multisite
- vault: jammy-antelope
- noble-caracal-multisite
- vault: noble-caracal
dev_bundles:
- jammy-antelope-multisite
- jammy-bobcat-multisite
- jammy-caracal-multisite
- vault: jammy-antelope
- vault: jammy-bobcat
- vault: jammy-caracal
- vault: jammy-antelope-namespaced
- vault: jammy-bobcat-namespaced
- vault: jammy-caracal-namespaced
- noble-caracal-multisite
- vault: noble-caracal
- vault: noble-caracal-namespaced
target_deploy_status:
vault:
@ -44,9 +38,3 @@ tests:
- zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
- zaza.openstack.charm_tests.ceph.tests.CephMonKeyRotationTests
tests_options:
force_deploy:
- jammy-antelope
- jammy-bobcat
- jammy-antelope-namespaced
- jammy-bobcat-namespaced