openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Caracal enablement 

Change-Id: I6ca31ca3b0cc8aedabaeaf2a2e64dede1248e388
Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
This commit is contained in:
Utkarsh Bhatt 2024-05-02 12:56:33 +05:30
parent 8ca8dc7cd8
commit d82bd8fd11
14 changed files with 56 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

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

2
metadata.yaml
View File

@ -16,8 +16,6 @@ tags:
series:
- focal
- jammy
- lunar
- mantic
extra-bindings:
public:
admin:

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

@ -47,7 +47,7 @@ applications:
- '2'
- '6'
- '7'
channel: latest/edge
channel: reef/edge
secondary-ceph-osd:
charm: ch:ceph-osd
@ -62,7 +62,7 @@ applications:
- '3'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
source: *source
to:
- '4'
channel: latest/edge
channel: reef/edge
secondary-ceph-mon:
charm: ch:ceph-mon
@ -82,7 +82,7 @@ applications:
source: *source
to:
- '5'
channel: latest/edge
channel: reef/edge
relations:
- - 'ceph-osd:mon'

14
tests/bundles/focal-yoga-namespaced.yaml
View File

@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
@ -61,7 +61,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -82,18 +82,18 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
channel: 1.8/edge
relations:

14
tests/bundles/focal-yoga.yaml
View File

@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
@ -60,7 +60,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -71,7 +71,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -81,18 +81,18 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
channel: 1.8/edge
relations:

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

@ -47,7 +47,7 @@ applications:
- '2'
- '6'
- '7'
channel: latest/edge
channel: reef/edge
secondary-ceph-osd:
charm: ch:ceph-osd
@ -62,7 +62,7 @@ applications:
- '3'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
source: *source
to:
- '4'
channel: latest/edge
channel: reef/edge
secondary-ceph-mon:
charm: ch:ceph-mon
@ -82,7 +82,7 @@ applications:
source: *source
to:
- '5'
channel: latest/edge
channel: reef/edge
relations:
- - 'ceph-osd:mon'

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

@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
@ -61,7 +61,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -82,18 +82,18 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
channel: 1.8/edge
relations:

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

@ -39,7 +39,7 @@ applications:
ceph-radosgw:
charm: ch:ceph-radosgw
channel: latest/edge
channel: reef/edge
num_units: 1
options:
source: *source
@ -59,7 +59,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -70,7 +70,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -80,7 +80,7 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
@ -91,7 +91,7 @@ applications:
num_units: 1
to:
- '11'
channel: 1.8/stable
channel: 1.8/edge
relations:

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

@ -47,7 +47,7 @@ applications:
- '2'
- '6'
- '7'
channel: latest/edge
channel: reef/edge
secondary-ceph-osd:
charm: ch:ceph-osd
@ -62,7 +62,7 @@ applications:
- '3'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
source: *source
to:
- '4'
channel: latest/edge
channel: reef/edge
secondary-ceph-mon:
charm: ch:ceph-mon
@ -82,7 +82,7 @@ applications:
source: *source
to:
- '5'
channel: latest/edge
channel: reef/edge
relations:
- - 'ceph-osd:mon'

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

@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
@ -61,7 +61,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -72,7 +72,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -82,18 +82,18 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
channel: 1.8/edge
relations:

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

@ -26,7 +26,7 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -37,7 +37,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
ceph-radosgw:
charm: ../../ceph-radosgw.charm
@ -60,7 +60,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -71,7 +71,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -81,18 +81,18 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault:
charm: ch:vault
num_units: 1
to:
- '11'
channel: latest/edge
channel: 1.8/edge
relations:

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

@ -58,7 +58,7 @@ applications:
- '4'
- '5'
- '6'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -69,7 +69,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
keystone:
expose: True
@ -79,7 +79,7 @@ applications:
openstack-origin: *source
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
vault-mysql-router:
charm: ch:mysql-router
@ -90,7 +90,7 @@ applications:
num_units: 1
to:
- '11'
channel: 1.8/stable
channel: 1.8/edge
relations:

123
tests/bundles/mantic-bobcat.yaml
View File

@ -1,123 +0,0 @@
options:
source: &source cloud:mantic-bobcat
series: mantic
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'

6
tests/tests.yaml
View File

@ -10,14 +10,8 @@ smoke_bundles:
- vault: jammy-antelope
dev_bundles:
- lunar-antelope-multisite
- mantic-bobcat-multisite
- jammy-antelope-multisite
- jammy-bobcat-multisite
- vault: lunar-antelope
- vault: mantic-bobcat
- vault: lunar-antelope-namespaced
- vault: mantic-bobcat-namespaced
- vault: jammy-antelope
- vault: jammy-bobcat
- vault: jammy-antelope-namespaced