openstack
/
charm-ceph-mon
Code Issues Proposed changes

Caracal-Squid Enablement 

Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
Change-Id: Iac40c02356ca4f5d453a149cd7ae83bef754b273
This commit is contained in:
Utkarsh Bhatt 2024-05-02 17:14:53 +05:30
parent 5f7ad409fe
commit c3a68fe2ba
6 changed files with 37 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

@ -36,9 +36,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]

4
metadata.yaml
View File

@ -13,8 +13,6 @@ tags:
series:
- focal
- jammy
- lunar
- mantic
peers:
mon:
interface: ceph
@ -50,4 +48,4 @@ resources:
alert-rules:
type: file
filename: alert.yaml.rules
description: "Alerting rules"
description: Alerting rules

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

@ -77,11 +77,11 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
channel: latest/edge
channel: reef/edge
num_units: 3
options:
source: *openstack-origin
@ -96,7 +96,7 @@ applications:
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
channel: reef/edge
to:
- '17'
@ -108,7 +108,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.2/edge
nova-compute:
charm: ch:nova-compute
@ -118,7 +118,7 @@ applications:
libvirt-image-backend: rbd
to:
- '11'
channel: latest/edge
channel: 2023.2/edge
glance:
expose: True
@ -128,7 +128,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '12'
channel: latest/edge
channel: 2023.2/edge
cinder:
expose: True
@ -140,11 +140,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.2/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: latest/edge
channel: 2023.2/edge
nova-cloud-controller:
expose: True
@ -154,7 +154,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2023.2/edge
placement:
charm: ch:placement
@ -163,7 +163,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.2/edge
prometheus2:
charm: ch:prometheus2

56
tests/bundles/lunar-antelope.yaml → tests/bundles/jammy-caracal.yaml
View File

@ -1,24 +1,20 @@
variables:
openstack-origin: &openstack-origin distro
# use infra (mysql, rabbit) from lts for stability
infra-series: &infra-series jammy
openstack-origin: &openstack-origin cloud:jammy-caracal
series: lunar
local_overlay_enabled: False
series: jammy
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':
@ -33,7 +29,6 @@ machines:
'15':
'16':
'17':
series: focal
applications:
@ -67,7 +62,7 @@ applications:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
- '9'
channel: 3.9/edge
ceph-osd:
@ -79,31 +74,31 @@ applications:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '3'
- '4'
- '5'
- '6'
channel: quincy/edge
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
channel: quincy/edge
channel: latest/edge
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: ch:ceph-fs
num_units: 1
options:
source: *openstack-origin
channel: quincy/edge
channel: latest/edge
to:
- '10'
- '17'
keystone:
expose: True
@ -112,8 +107,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '11'
channel: 2023.1/edge
- '10'
channel: latest/edge
nova-compute:
charm: ch:nova-compute
@ -122,8 +117,8 @@ applications:
openstack-origin: *openstack-origin
libvirt-image-backend: rbd
to:
- '12'
channel: 2023.1/edge
- '11'
channel: latest/edge
glance:
expose: True
@ -132,8 +127,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '13'
channel: 2023.1/edge
- '12'
channel: latest/edge
cinder:
expose: True
@ -144,12 +139,12 @@ applications:
glance-api-version: '2'
openstack-origin: *openstack-origin
to:
- '14'
channel: 2023.1/edge
- '13'
channel: latest/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: 2023.1/edge
channel: latest/edge
nova-cloud-controller:
expose: True
@ -158,8 +153,8 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: 2023.1/edge
- '14'
channel: latest/edge
placement:
charm: ch:placement
@ -167,15 +162,14 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: 2023.1/edge
- '15'
channel: latest/edge
prometheus2:
charm: ch:prometheus2
num_units: 1
series: focal
to:
- '17'
- '16'
relations:
- - 'nova-compute:amqp'

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

@ -1,267 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
# use infra (mysql, rabbit) from lts for stability
infra-series: &infra-series jammy
series: mantic
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':
series: focal
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0/edge
placement-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
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.9/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: '10G'
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '4'
- '5'
- '6'
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
channel: quincy/edge
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
to:
- '7'
- '8'
- '9'
ceph-fs:
charm: ch:ceph-fs
num_units: 1
options:
source: *openstack-origin
channel: quincy/edge
to:
- '10'
keystone:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
libvirt-image-backend: rbd
to:
- '12'
channel: 2023.1/edge
glance:
expose: True
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
channel: 2023.1/edge
cinder:
expose: True
charm: ch:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: *openstack-origin
to:
- '14'
channel: 2023.1/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: 2023.1/edge
nova-cloud-controller:
expose: True
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: 2023.1/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: 2023.1/edge
prometheus2:
charm: ch:prometheus2
num_units: 1
series: focal
to:
- '17'
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-compute:ceph'
- 'ceph-mon:client'
- - nova-compute:ceph-access
- cinder-ceph:ceph-access
- - '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'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:ceph'
- 'ceph-mon:client'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:image-service'
- 'glance:image-service'
- - 'cinder-ceph:storage-backend'
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-mon:client'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-mon:mds'
- 'ceph-fs:ceph-mds'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement'
- 'keystone'
- - 'placement'
- 'nova-cloud-controller'
- - 'ceph-mon:prometheus'
- 'prometheus2:target'

2
tests/tests.yaml
View File

@ -5,7 +5,7 @@ gate_bundles:
- focal-yoga
- jammy-yoga
- jammy-bobcat
- mantic-bobcat
- jammy-caracal
smoke_bundles:
- focal-yoga