openstack/charm-cinder
Code Issues Proposed changes

Merge "Stable artefacts for stable/2023.1 (antelope)" into stable/2023.1

Browse Source
This commit is contained in:
Zuul 2023-05-10 15:51:37 +00:00 committed by Gerrit Code Review
commit 2965efa8fa
6 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-cinder.git
defaultbranch=stable/2023.1

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/antelope
destination: charmhelpers
include:
- core

4
test-requirements.txt
View File

@ -19,8 +19,8 @@ cliff<3.0.0
coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/antelope#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest

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

@ -27,40 +27,40 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -71,7 +71,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -93,7 +93,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -102,7 +102,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -121,11 +121,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -143,7 +143,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ../../cinder.charm
@ -163,7 +163,7 @@ applications:
options:
block-device: "/mnt/cinder-lvm-block|20G"
config-flags: "target_helper=lioadm"
channel: latest/edge
channel: 2023.1/edge
relations:

36
tests/bundles/jammy-zed.yaml
View File

@ -27,40 +27,40 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -71,7 +71,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -93,7 +93,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -102,7 +102,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -121,11 +121,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -143,7 +143,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ../../cinder.charm
@ -163,7 +163,7 @@ applications:
options:
block-device: "/mnt/cinder-lvm-block|20G"
config-flags: "target_helper=lioadm"
channel: latest/edge
channel: 2023.1/edge
relations:

36
tests/bundles/lunar-antelope.yaml
View File

@ -27,40 +27,40 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -71,7 +71,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -81,7 +81,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -93,7 +93,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -102,7 +102,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -121,11 +121,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ch:nova-compute
@ -143,7 +143,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ../../cinder.charm
@ -163,7 +163,7 @@ applications:
options:
block-device: "/mnt/cinder-lvm-block|20G"
config-flags: "target_helper=lioadm"
channel: latest/edge
channel: 2023.1/edge
relations: