openstack
/
charm-ceph-rbd-mirror
Code Issues Proposed changes

Caracal-Squid Enablement 

Change-Id: If6ac4379eaa222f0243d78caf47acaaf2b95f0f2
Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
This commit is contained in:
Utkarsh Bhatt 2024-05-02 16:50:20 +05:30
parent 86a9e6942a
commit 881e21bdc1
7 changed files with 25 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charmcraft.yaml
View File

@ -27,10 +27,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
osci.yaml
View File

@ -7,4 +7,4 @@
needs_charm_build: true
charm_build_name: ceph-rbd-mirror
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/stable

2
src/metadata.yaml
View File

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

18
src/tests/bundles/jammy-bobcat.yaml
View File

@ -40,7 +40,7 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2023.2/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -54,26 +54,26 @@ applications:
block-device: None
glance-api-version: 2
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2023.2/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
channel: 2023.2/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2023.2/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2023.2/edge
ceph-mon:
charm: ch:ceph-mon
@ -81,7 +81,7 @@ applications:
options:
expected-osd-count: 3
source: *openstack-origin
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@ -91,7 +91,7 @@ applications:
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
channel: latest/edge
channel: reef/edge
ceph-rbd-mirror:
series: *series
@ -106,7 +106,7 @@ applications:
options:
expected-osd-count: 3
source: *openstack-origin
channel: latest/edge
channel: reef/edge
ceph-osd-b:
charm: ch:ceph-osd
@ -116,7 +116,7 @@ applications:
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
channel: latest/edge
channel: reef/edge
ceph-rbd-mirror-b:
series: *series

90
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,44 +1,18 @@
variables:
openstack-origin: &openstack-origin distro
series: &series mantic
infra-series: &infra-series jammy
openstack-origin: &openstack-origin cloud:jammy-caracal
series: &series jammy
local_overlay_enabled: False
series: *series
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: *infra-series
constraints: "mem=3072M"
'1':
constraints: mem=3072M
series: *infra-series
constraints: "mem=3072M"
'2':
constraints: mem=3072M
series: *infra-series
'3':
series: *infra-series
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
constraints: "mem=3072M"
applications:
@ -55,31 +29,22 @@ applications:
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
# Reduce chances of spurious "super-read-only" failures, see lp:1882205
expel-timeout: 20
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
series: *infra-series
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.9/edge
series: *infra-series
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
channel: latest/edge
cinder:
@ -88,8 +53,7 @@ applications:
options:
block-device: None
glance-api-version: 2
to:
- '5'
openstack-origin: *openstack-origin
channel: latest/edge
cinder-ceph:
@ -102,8 +66,6 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
nova-compute:
@ -111,21 +73,14 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
expected-osd-count: 3
to:
- '8'
- '9'
- '10'
source: *openstack-origin
channel: latest/edge
ceph-osd:
@ -136,10 +91,6 @@ applications:
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '11'
- '12'
- '13'
channel: latest/edge
ceph-rbd-mirror:
@ -148,20 +99,13 @@ applications:
num_units: 1
options:
source: *openstack-origin
to:
- '14'
ceph-mon-b:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
expected-osd-count: 3
to:
- '15'
- '16'
- '17'
source: *openstack-origin
channel: latest/edge
ceph-osd-b:
@ -172,10 +116,6 @@ applications:
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '18'
- '19'
- '20'
channel: latest/edge
ceph-rbd-mirror-b:
@ -184,8 +124,6 @@ applications:
num_units: 1
options:
source: *openstack-origin
to:
- '21'
relations:

246
src/tests/bundles/lunar-antelope.yaml
View File

@ -1,246 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: &series lunar
infra-series: &infra-series jammy
local_overlay_enabled: False
series: *series
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: *infra-series
'1':
constraints: mem=3072M
series: *infra-series
'2':
constraints: mem=3072M
series: *infra-series
'3':
series: *infra-series
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
# Reduce chances of spurious "super-read-only" failures, see lp:1882205
expel-timeout: 20
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
series: *infra-series
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.9/edge
series: *infra-series
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: 2023.1/edge
cinder:
charm: ch:cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
to:
- '5'
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: 2023.1/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: 2023.1/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
expected-osd-count: 3
to:
- '8'
- '9'
- '10'
channel: quincy/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
bluestore: False
use-direct-io: False
osd-devices: '/dev/test-non-existent'
to:
- '11'
- '12'
- '13'
channel: quincy/edge
ceph-rbd-mirror:
series: *series
charm: ../../../ceph-rbd-mirror.charm
num_units: 1
options:
source: *openstack-origin
to:
- '14'
ceph-mon-b:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
expected-osd-count: 3
to:
- '15'
- '16'
- '17'
channel: quincy/edge
ceph-osd-b:
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
bluestore: False
use-direct-io: False
osd-devices: '/dev/test-non-existent'
to:
- '18'
- '19'
- '20'
channel: quincy/edge
ceph-rbd-mirror-b:
series: *series
charm: ../../../ceph-rbd-mirror.charm
num_units: 1
options:
source: *openstack-origin
to:
- '21'
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - glance:shared-db
- glance-mysql-router:shared-db
- - glance-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - cinder-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - rabbitmq-server
- cinder
- - 'keystone:identity-service'
- cinder
- - 'keystone:identity-service'
- glance
- - cinder
- cinder-ceph
- - cinder-ceph:ceph
- ceph-mon:client
- - nova-compute:ceph-access
- cinder-ceph:ceph-access
- - nova-compute:amqp
- rabbitmq-server:amqp
- - glance:image-service
- nova-compute:image-service
- - glance
- ceph-mon
- - ceph-mon:osd
- ceph-osd:mon
- - ceph-mon
- ceph-rbd-mirror:ceph-local
- - ceph-mon
- ceph-rbd-mirror-b:ceph-remote
- - ceph-mon-b:osd
- ceph-osd-b:mon
- - ceph-mon-b
- ceph-rbd-mirror-b:ceph-local
- - ceph-mon-b
- ceph-rbd-mirror:ceph-remote

3
src/tests/tests.yaml
View File

@ -3,7 +3,6 @@ smoke_bundles:
- jammy-antelope
gate_bundles:
- jammy-bobcat
- mantic-bobcat
comment: |
The e2e bundles are useful for development but adds no additional value to
the functional tests.
@ -20,4 +19,4 @@ tests:
- zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorDisasterFailoverTest
tests_options:
force_deploy:
- mantic-bobcat
- jammy-caracal