openstack/charm-cinder-backup-swift-proxy
Code Issues Proposed changes

Add 2023.2 Bobcat support

Browse Source 
* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* add mantic to metadata series
* align testing with bobcat
* add new bobcat bundles
* add bobcat bundles to tests.yaml
* add bobcat tests to osci.yaml
* update build-on and run-on bases
* drop kinetic
* update charmcraft_channel to 2.x/edge

Change-Id: I505395a4f779512c788f3e71b3e79cf777fd79e1
This commit is contained in:
Corey Bryant
2023-07-18 16:47:18 -04:00
parent 4b234f4897
commit 3dd47bc24b
8 changed files with 401 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
charmcraft.yaml
View File

@@ -28,51 +28,91 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.10"
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- name: ubuntu
channel: "23.04"
architectures: [arm64]
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.10"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

2
osci.yaml
View File

@@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: cinder-backup-swift-proxy
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/edge

2
src/metadata.yaml
View File

@@ -9,8 +9,8 @@ tags:
- misc
series:
- jammy
- kinetic
- lunar
- mantic
subordinate: true
provides:
backup-backend:

2
src/tests/bundles/jammy-antelope.yaml
View File

@@ -109,7 +109,7 @@ applications:
channel: latest/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
num_units: 0
options:
auth-version: 3

4
src/tests/bundles/jammy-zed.yaml → src/tests/bundles/jammy-bobcat.yaml
View File

@@ -1,5 +1,5 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-zed
openstack-origin: &openstack-origin cloud:jammy-bobcat
local_overlay_enabled: False
@@ -109,7 +109,7 @@ applications:
channel: latest/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
num_units: 0
options:
auth-version: 3

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

@@ -109,7 +109,7 @@ applications:
channel: latest/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../cinder-backup-swift-proxy_ubuntu-23.04-amd64.charm
num_units: 0
options:
auth-version: 3

328
src/tests/bundles/mantic-bobcat.yaml Normal file
View File

@@ -0,0 +1,328 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
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':
constraints: mem=3072M
'4':
constraints: mem=3072M
'5':
constraints: mem=3072M
'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
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '9'
- '10'
- '11'
channel: latest/edge
cinder:
charm: ch:cinder
num_units: 1
options:
block-device: None
openstack-origin: *openstack-origin
glance-api-version: 2
to:
- '12'
channel: latest/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-23.10-amd64.charm
num_units: 0
options:
auth-version: 3
swift-user: admin
swift-key: openstack
user-domain: admin_domain
project-domain: admin_domain
project-name: admin
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '16'
channel: latest/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
# external swift
swift-keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
swift-mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '3'
- '4'
- '5'
channel: latest/edge
swift-keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
preferred-api-version: 3
to:
- '19'
channel: latest/edge
swift-proxy:
charm: ch:swift-proxy
num_units: 1
options:
openstack-origin: *openstack-origin
zone-assignment: manual
replicas: 1
to:
- '20'
channel: latest/edge
swift-storage:
charm: ch:swift-storage
num_units: 1
options:
openstack-origin: *openstack-origin
zone: 1
storage:
block-devices: 'cinder,10G'
to:
- '21'
channel: latest/edge
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'cinder:image-service'
- 'glance:image-service'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'cinder:cinder-volume-service'
- 'nova-cloud-controller:cinder-volume-service'
- - 'cinder-ceph:storage-backend'
- 'cinder:storage-backend'
- - 'cinder'
- 'cinder-backup-swift-proxy'
- - 'ceph-mon:client'
- 'nova-compute:ceph'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-mon:client'
- 'cinder-ceph:ceph'
- - 'ceph-mon:client'
- 'glance:ceph'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
# external swift service
- - 'swift-keystone:shared-db'
- 'swift-keystone-mysql-router:shared-db'
- - 'swift-keystone-mysql-router:db-router'
- 'swift-mysql-innodb-cluster:db-router'
- - 'swift-proxy:identity-service'
- 'swift-keystone:identity-service'
- - 'swift-proxy:swift-storage'
- 'swift-storage:swift-storage'

6
src/tests/tests.yaml
View File

@@ -1,9 +1,10 @@
charm_name: cinder-backup-swift-proxy
gate_bundles:
- jammy-zed
dev_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
smoke_bundles:
- jammy-yoga
configure:
@@ -13,3 +14,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat