openstack
/
charm-cinder-ceph
Code Issues Proposed changes

Stable artefacts for stable/2023.1 (antelope) 

This patch is to lock the stable/2023.1 (antelope release) charms
down so that as much as possible.
In particular, this patch does:

- set the .gitreview to stable/2023.1
- lock zaza and zaza-openstack-tests to stable/antelope branches
- for reactive charms Add build.lock files to lock the layers
  and python modules used to build the charm.
- for ops framework charms, extract a pip freeze from the
  charmcraft container after building the charm to lock the
  modules used to build the charm.
- drop the kinetic bundles if the exist. (Note the updates to
  tests.yaml is in another batch (topic: antelope-voting)
- update the bundles so that they point to the antelope specific
  channels.  e.g. 2023.1/edge for OpenStack charms, 23.03/edge for
  OVN charms, quincy/edge for Ceph charms and generally, the
  appropriate LTS Jammy branch for the various support charms.

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1064
Change-Id: I75bf95f8328a61731568dbb0e8277828bbab3032
This commit is contained in:
Alex Kavanagh 2023-04-20 18:59:25 +01:00 committed by Felipe Reyes
parent 866cb7fdb3
commit fedf3088f0
9 changed files with 126 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitreview
View File

@ -2,3 +2,6 @@
host=review.opendev.org
port=29418
project=openstack/charm-cinder-ceph.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

40
tests/bundles/jammy-antelope-ec.yaml
View File

@ -32,33 +32,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -75,7 +75,7 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -87,14 +87,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -105,7 +105,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -115,7 +115,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -128,7 +128,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -137,7 +137,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -147,7 +147,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -156,11 +156,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -171,7 +171,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -193,7 +193,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations:

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

@ -29,33 +29,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -69,7 +69,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -81,14 +81,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -99,7 +99,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -109,7 +109,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -122,7 +122,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -131,7 +131,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -141,7 +141,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -150,11 +150,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -165,7 +165,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -183,7 +183,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations:

40
tests/bundles/jammy-zed-ec.yaml
View File

@ -32,33 +32,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -75,7 +75,7 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -87,14 +87,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -105,7 +105,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -115,7 +115,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -128,7 +128,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -137,7 +137,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -147,7 +147,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -156,11 +156,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -171,7 +171,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -193,7 +193,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations:

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

@ -29,33 +29,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -69,7 +69,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -81,14 +81,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -99,7 +99,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -109,7 +109,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -122,7 +122,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -131,7 +131,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -141,7 +141,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -150,11 +150,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -165,7 +165,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -183,7 +183,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations:

40
tests/bundles/lunar-antelope-ec.yaml
View File

@ -32,33 +32,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -75,7 +75,7 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -87,14 +87,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -105,7 +105,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -115,7 +115,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -128,7 +128,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -137,7 +137,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -147,7 +147,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -156,11 +156,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -171,7 +171,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -193,7 +193,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations:

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

@ -29,33 +29,33 @@ 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
ceph-osd:
charm: ch:ceph-osd
@ -69,7 +69,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -81,14 +81,14 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -99,7 +99,7 @@ applications:
debug: true
to:
- '10'
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -109,7 +109,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -122,7 +122,7 @@ applications:
neutron-security-groups: true
to:
- '12'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -131,7 +131,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -141,7 +141,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '14'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -150,11 +150,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
cinder:
charm: ch:cinder
@ -165,7 +165,7 @@ applications:
glance-api-version: 2
to:
- '16'
channel: latest/edge
channel: 2023.1/edge
cinder-ceph:
charm: ../../cinder-ceph.charm
@ -183,7 +183,7 @@ applications:
debug: true
to:
- '17'
channel: latest/edge
channel: 2023.1/edge
relations: