openstack/charm-manila
Code Issues Proposed changes

Updates for caracal testing support

Browse Source 
These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: Ic2ed85c2c4465179cf3a7c7e7d78c16a699147a1
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 2cfb486f41
commit 994906e324
10 changed files with 78 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
charmcraft.yaml
View File

@ -53,67 +53,3 @@ bases:
- name: ubuntu - name: ubuntu
channel: "22.04" channel: "22.04"
architectures: [arm64] 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: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
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: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
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 needs_charm_build: true
charm_build_name: manila charm_build_name: manila
build_type: charmcraft build_type: charmcraft
charmcraft_channel: 2.x/edge charmcraft_channel: 2.x/stable

6
src/metadata.yaml
View File

@ -9,11 +9,9 @@ description: |
file system, mount the file system on your instances, and then read and write file system, mount the file system on your instances, and then read and write
data from your instances to and from your file system. data from your instances to and from your file system.
tags: tags:
- openstack - openstack
series: series:
- jammy - jammy
- lunar
- mantic
subordinate: false subordinate: false
requires: requires:
shared-db: shared-db:

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

@ -81,7 +81,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@ -92,7 +92,7 @@ services:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -105,7 +105,7 @@ services:
- '7' - '7'
- '8' - '8'
- '9' - '9'
channel: latest/edge channel: reef/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -115,7 +115,7 @@ services:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: reef/edge
manila: manila:
charm: ../../../manila_ubuntu-22.04-amd64.charm charm: ../../../manila_ubuntu-22.04-amd64.charm
@ -137,7 +137,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -153,7 +153,7 @@ services:
to: to:
- '16' - '16'
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -162,7 +162,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -175,11 +175,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -189,7 +189,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -198,7 +198,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -214,7 +214,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: latest/edge channel: 2024.1/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe

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

@ -81,7 +81,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@ -92,7 +92,7 @@ services:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -105,7 +105,7 @@ services:
- '7' - '7'
- '8' - '8'
- '9' - '9'
channel: latest/edge channel: reef/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -115,7 +115,7 @@ services:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: reef/edge
manila: manila:
charm: ../../../manila_ubuntu-22.04-amd64.charm charm: ../../../manila_ubuntu-22.04-amd64.charm
@ -137,7 +137,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -153,7 +153,7 @@ services:
to: to:
- '16' - '16'
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -162,7 +162,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -175,11 +175,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -189,7 +189,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -198,7 +198,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -214,7 +214,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: latest/edge channel: 2024.1/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe

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

@ -1,9 +1,9 @@
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: False local_overlay_enabled: False
series: mantic series: jammy
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -74,7 +74,6 @@ services:
- '2' - '2'
channel: latest/edge channel: latest/edge
# manila backends
manila-ganesha: manila-ganesha:
num_units: 1 num_units: 1
charm: ch:manila-ganesha charm: ch:manila-ganesha
@ -82,12 +81,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
manila-generic:
charm: ch:manila-generic
channel: latest/edge
options:
driver-handles-share-servers: False
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@ -98,7 +92,7 @@ services:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -111,7 +105,7 @@ services:
- '7' - '7'
- '8' - '8'
- '9' - '9'
channel: latest/edge channel: reef/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -121,10 +115,10 @@ services:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: reef/edge
manila: manila:
charm: ../../../manila_ubuntu-23.10-amd64.charm charm: ../../../manila_ubuntu-22.04-amd64.charm
num_units: 3 num_units: 3
options: options:
default-share-backend: cephfsnfs1 default-share-backend: cephfsnfs1
@ -143,7 +137,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -159,7 +153,7 @@ services:
to: to:
- '16' - '16'
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -168,7 +162,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -181,11 +175,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -195,7 +189,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -204,7 +198,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -220,7 +214,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: latest/edge channel: 2024.1/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe
@ -249,8 +243,6 @@ relations:
- - 'manila' - - 'manila'
- 'manila-ganesha' - 'manila-ganesha'
- - 'manila:manila-plugin'
- 'manila-generic:manila-plugin'
- - 'manila-ganesha:shared-db' - - 'manila-ganesha:shared-db'
- 'manila-ganesha-mysql-router:shared-db' - 'manila-ganesha-mysql-router:shared-db'

36
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False local_overlay_enabled: False
series: lunar series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -74,7 +74,6 @@ services:
- '2' - '2'
channel: latest/edge channel: latest/edge
# manila backends
manila-ganesha: manila-ganesha:
num_units: 1 num_units: 1
charm: ch:manila-ganesha charm: ch:manila-ganesha
@ -82,12 +81,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
manila-generic:
charm: ch:manila-generic
channel: latest/edge
options:
driver-handles-share-servers: False
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@ -98,7 +92,7 @@ services:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge channel: reef/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -111,7 +105,7 @@ services:
- '7' - '7'
- '8' - '8'
- '9' - '9'
channel: latest/edge channel: reef/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -121,10 +115,10 @@ services:
to: to:
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: reef/edge
manila: manila:
charm: ../../../manila_ubuntu-23.04-amd64.charm charm: ../../../manila_ubuntu-22.04-amd64.charm
num_units: 3 num_units: 3
options: options:
default-share-backend: cephfsnfs1 default-share-backend: cephfsnfs1
@ -143,7 +137,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -159,7 +153,7 @@ services:
to: to:
- '16' - '16'
- '17' - '17'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -168,7 +162,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -181,11 +175,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -195,7 +189,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -204,7 +198,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -220,7 +214,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: latest/edge channel: 2024.1/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe
@ -249,8 +243,6 @@ relations:
- - 'manila' - - 'manila'
- 'manila-ganesha' - 'manila-ganesha'
- - 'manila:manila-plugin'
- 'manila-generic:manila-plugin'
- - 'manila-ganesha:shared-db' - - 'manila-ganesha:shared-db'
- 'manila-ganesha-mysql-router:shared-db' - 'manila-ganesha-mysql-router:shared-db'

26
src/tests/tests.yaml
View File

@ -1,20 +1,17 @@
charm_name: manila charm_name: manila
gate_bundles: gate_bundles:
- jammy-antelope - jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles: dev_bundles:
- jammy-bobcat - noble-caracal
- lunar-antelope
- mantic-bobcat
smoke_bundles: smoke_bundles:
- jammy-antelope - jammy-caracal
target_deploy_status: target_deploy_status:
nrpe: nrpe:
workload-status: blocked workload-status: blocked
workload-status-message-prefix: "Nagios server not configured or related" workload-status-message-prefix: "Nagios server not configured or related"
tests: tests:
- zaza.openstack.charm_tests.manila.tests.ManilaTests - zaza.openstack.charm_tests.manila.tests.ManilaTests
@ -28,13 +25,10 @@ configure:
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.manila_ganesha.setup.setup_ganesha_share_type - zaza.openstack.charm_tests.manila_ganesha.setup.setup_ganesha_share_type
configure_options: configure_options:
configure_gateway_ext_port_use_juju_wait: False configure_gateway_ext_port_use_juju_wait: false
tests_options: tests_options:
force_deploy: force_deploy:
# nrpe charm doesn't support jammy+ and needs to be force installed # nrpe charm doesn't support jammy+ and needs to be force installed
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008 # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
- jammy-antelope - noble-caracal
- jammy-bobcat
- lunar-antelope
- mantic-bobcat

4
src/tox.ini
View File

@ -25,7 +25,9 @@ passenv =
CS_* CS_*
OS_* OS_*
TEST_* TEST_*
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3

12
tox.ini
View File

@ -59,12 +59,16 @@ commands =
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
@ -77,7 +81,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon # Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}