openstack/charm-cinder-backup-swift-proxy
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-15 14:18:28 +00:00
committed by Gerrit Code Review
parent 477817e934 25e2d38afa
commit cade76a11c
8 changed files with 258 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

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

182
src/build.lock Normal file
View File

@@ -0,0 +1,182 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "a41b3559d629993d960af65104108f66ab9795a8",
"commit": "a41b3559d629993d960af65104108f66ab9795a8"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25",
"commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25"
},
{
"type": "layer",
"item": "cinder-backup-swift-proxy",
"url": null,
"vcs": null,
"branch": null,
"commit": ""
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce",
"commit": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce"
},
{
"type": "layer",
"item": "interface:cinder-backup",
"url": "https://github.com/openstack/charm-interface-cinder-backup.git",
"vcs": null,
"branch": "a1cdf71ad61d4ea5f912d8e0423e887ae761bff7",
"commit": "a1cdf71ad61d4ea5f912d8e0423e887ae761bff7"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "2.1.2"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.11.1"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "49.6.0"
},
{
"type": "python_module",
"package": "Cython",
"vcs": null,
"version": "0.29.34"
},
{
"type": "python_module",
"package": "poetry_core",
"vcs": null,
"version": "1.5.2"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "6.0"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "6.4.2"
},
{
"type": "python_module",
"package": "tomli",
"vcs": null,
"version": "2.0.1"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "22.0.4"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "2.3.0"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.40.0"
},
{
"type": "python_module",
"package": "flit_core",
"vcs": null,
"version": "3.8.0"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.9.5"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "stable/antelope",
"version": "b9444c20fdf3dc938790ed208cd1053b60055590",
"vcs": "git"
},
{
"type": "python_module",
"package": "packaging",
"vcs": null,
"version": "23.1"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.5.2"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "3.1.2"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "stable/antelope",
"version": "7a589883545284e0a6303c7977402afb38e99d46",
"vcs": "git"
}
]
}

4
src/test-requirements.txt
View File

@@ -5,5 +5,5 @@
# #
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza.git@stable/antelope#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack

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

@@ -41,30 +41,30 @@ applications:
keystone-mysql-router: keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
glance-mysql-router: glance-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
cinder-mysql-router: cinder-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
placement-mysql-router: placement-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge channel: 8.0/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@@ -76,7 +76,7 @@ applications:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: latest/edge channel: quincy/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: quincy/edge
cinder: cinder:
charm: ch:cinder charm: ch:cinder
@@ -101,12 +101,12 @@ applications:
glance-api-version: 2 glance-api-version: 2
to: to:
- '12' - '12'
channel: latest/edge channel: 2023.1/edge
cinder-ceph: cinder-ceph:
charm: ch:cinder-ceph charm: ch:cinder-ceph
num_units: 0 num_units: 0
channel: latest/edge channel: 2023.1/edge
cinder-backup-swift-proxy: 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_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '13' - '13'
channel: latest/edge channel: 2023.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: latest/edge channel: 2023.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@@ -144,14 +144,14 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2023.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '16' - '16'
channel: latest/edge channel: 3.9/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2023.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@@ -170,23 +170,23 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2023.1/edge
# external swift # external swift
swift-keystone-mysql-router: swift-keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
swift-mysql-innodb-cluster: swift-mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '3' - '3'
- '4' - '4'
- '5' - '5'
channel: latest/edge channel: 8.0/edge
swift-keystone: swift-keystone:
charm: ch:keystone charm: ch:keystone
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3 preferred-api-version: 3
to: to:
- '19' - '19'
channel: latest/edge channel: 2023.1/edge
swift-proxy: swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1 replicas: 1
to: to:
- '20' - '20'
channel: latest/edge channel: 2023.1/edge
swift-storage: swift-storage:
charm: ch:swift-storage charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
to: to:
- '21' - '21'
channel: latest/edge channel: 2023.1/edge
relations: relations:

46
src/tests/bundles/jammy-zed.yaml
View File

@@ -41,30 +41,30 @@ applications:
keystone-mysql-router: keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
glance-mysql-router: glance-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
cinder-mysql-router: cinder-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
placement-mysql-router: placement-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge channel: 8.0/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@@ -76,7 +76,7 @@ applications:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: latest/edge channel: quincy/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: quincy/edge
cinder: cinder:
charm: ch:cinder charm: ch:cinder
@@ -101,12 +101,12 @@ applications:
glance-api-version: 2 glance-api-version: 2
to: to:
- '12' - '12'
channel: latest/edge channel: 2023.1/edge
cinder-ceph: cinder-ceph:
charm: ch:cinder-ceph charm: ch:cinder-ceph
num_units: 0 num_units: 0
channel: latest/edge channel: 2023.1/edge
cinder-backup-swift-proxy: 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_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '13' - '13'
channel: latest/edge channel: 2023.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: latest/edge channel: 2023.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@@ -144,14 +144,14 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2023.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '16' - '16'
channel: latest/edge channel: 3.9/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2023.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@@ -170,23 +170,23 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2023.1/edge
# external swift # external swift
swift-keystone-mysql-router: swift-keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
swift-mysql-innodb-cluster: swift-mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '3' - '3'
- '4' - '4'
- '5' - '5'
channel: latest/edge channel: 8.0/edge
swift-keystone: swift-keystone:
charm: ch:keystone charm: ch:keystone
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3 preferred-api-version: 3
to: to:
- '19' - '19'
channel: latest/edge channel: 2023.1/edge
swift-proxy: swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1 replicas: 1
to: to:
- '20' - '20'
channel: latest/edge channel: 2023.1/edge
swift-storage: swift-storage:
charm: ch:swift-storage charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
to: to:
- '21' - '21'
channel: latest/edge channel: 2023.1/edge
relations: relations:

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

@@ -41,30 +41,30 @@ applications:
keystone-mysql-router: keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
glance-mysql-router: glance-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
cinder-mysql-router: cinder-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
placement-mysql-router: placement-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge channel: 8.0/edge
ceph-mon: ceph-mon:
charm: ch:ceph-mon charm: ch:ceph-mon
@@ -76,7 +76,7 @@ applications:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: latest/edge channel: quincy/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: latest/edge channel: quincy/edge
cinder: cinder:
charm: ch:cinder charm: ch:cinder
@@ -101,12 +101,12 @@ applications:
glance-api-version: 2 glance-api-version: 2
to: to:
- '12' - '12'
channel: latest/edge channel: 2023.1/edge
cinder-ceph: cinder-ceph:
charm: ch:cinder-ceph charm: ch:cinder-ceph
num_units: 0 num_units: 0
channel: latest/edge channel: 2023.1/edge
cinder-backup-swift-proxy: 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_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '13' - '13'
channel: latest/edge channel: 2023.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: latest/edge channel: 2023.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@@ -144,14 +144,14 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: latest/edge channel: 2023.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '16' - '16'
channel: latest/edge channel: 3.9/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '17' - '17'
channel: latest/edge channel: 2023.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@@ -170,23 +170,23 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2023.1/edge
# external swift # external swift
swift-keystone-mysql-router: swift-keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: latest/edge channel: 8.0/edge
swift-mysql-innodb-cluster: swift-mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: distro
to: to:
- '3' - '3'
- '4' - '4'
- '5' - '5'
channel: latest/edge channel: 8.0/edge
swift-keystone: swift-keystone:
charm: ch:keystone charm: ch:keystone
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3 preferred-api-version: 3
to: to:
- '19' - '19'
channel: latest/edge channel: 2023.1/edge
swift-proxy: swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1 replicas: 1
to: to:
- '20' - '20'
channel: latest/edge channel: 2023.1/edge
swift-storage: swift-storage:
charm: ch:swift-storage charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
to: to:
- '21' - '21'
channel: latest/edge channel: 2023.1/edge
relations: relations:

4
src/wheelhouse.txt
View File

@@ -1,5 +1,5 @@
setuptools < 50.0 setuptools < 50.0
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers git+https://github.com/juju/charm-helpers.git@stable/antelope#egg=charmhelpers

2
test-requirements.txt
View File

@@ -19,7 +19,7 @@ mock>=1.2
nose>=1.3.7 nose>=1.3.7
coverage>=3.6 coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack
# #
# Revisit for removal / mock improvement: # Revisit for removal / mock improvement:
# #