openstack
/
charm-cinder-backup
Code Issues Proposed changes

21.10 - Stable cut of charms for testing period 

* use stable/21.10 libraries
* use zaza/zaza-openstack-tests at stable/21.10
* build.lock files for reactive charms
* bundles refer to ~openstack-charms candidate channel
* update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: Iad8e18dcd0d30300a2da5829d55894ce80b09198
This commit is contained in:
Alex Kavanagh 2021-10-11 19:02:21 +01:00
parent 21e28278db
commit 1b22602ac8
20 changed files with 330 additions and 157 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-backup.git
defaultbranch=stable/21.10

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/21.10
destination: hooks/charmhelpers
include:
- core

18
pip.sh Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env bash
#
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of tox.ini for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
# install blessings (an indirect dependency of charm-tools).
#
# More details on the beahvior of tox and virtualenv creation can be found at
# https://github.com/tox-dev/tox/issues/448
#
# This script is wrapper to force the use of the pinned versions early in the
# process when the virtualenv was created and upgraded before installing the
# depedencies declared in the target.
pip install 'pip<20.3' 'setuptools<50.0.0'
pip "$@"

5
test-requirements.txt
View File

@ -7,6 +7,7 @@
# requirements. They are intertwined. Also, Zaza itself should specify
# all of its own requirements and if it doesn't, fix it there.
#
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
requests>=2.18.4
@ -36,8 +37,8 @@ oslo.utils<=3.41.0;python_version<'3.6'
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/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'

27
tests/bundles/bionic-queens.yaml
View File

@ -30,48 +30,57 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: bionic
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/bionic-rocky.yaml
View File

@ -30,54 +30,63 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-rocky
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-rocky
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-rocky
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-rocky
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: bionic
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/bionic-stein.yaml
View File

@ -30,54 +30,63 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-stein
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-stein
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-stein
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-stein
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: bionic
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/bionic-train.yaml
View File

@ -30,53 +30,62 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-train
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
source: cloud:bionic-train
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-train
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-train
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: bionic
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/bionic-ussuri.yaml
View File

@ -30,53 +30,62 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-train
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
source: cloud:bionic-train
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-train
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-train
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: bionic
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

36
tests/bundles/focal-ussuri.yaml
View File

@ -27,14 +27,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -42,23 +45,26 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -67,9 +73,10 @@ applications:
- '5'
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '8'
- '9'
- '10'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -90,6 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
@ -97,21 +106,24 @@ applications:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '12'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '13'
channel: candidate
relations:

36
tests/bundles/focal-victoria.yaml
View File

@ -27,14 +27,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -42,23 +45,26 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -67,9 +73,10 @@ applications:
- '5'
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '8'
- '9'
- '10'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -90,6 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
@ -97,21 +106,24 @@ applications:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '12'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '13'
channel: candidate
relations:

36
tests/bundles/focal-wallaby.yaml
View File

@ -27,14 +27,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -42,23 +45,26 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -67,9 +73,10 @@ applications:
- '5'
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '8'
- '9'
- '10'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -90,6 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
@ -97,21 +106,24 @@ applications:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '12'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '13'
channel: candidate
relations:

36
tests/bundles/groovy-victoria.yaml
View File

@ -27,14 +27,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -42,23 +45,26 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -67,9 +73,10 @@ applications:
- '5'
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '8'
- '9'
- '10'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -90,6 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
@ -97,21 +106,24 @@ applications:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '12'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '13'
channel: candidate
relations:

36
tests/bundles/hirsute-wallaby.yaml
View File

@ -27,14 +27,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -42,23 +45,26 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -67,9 +73,10 @@ applications:
- '5'
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '8'
- '9'
- '10'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -90,6 +98,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '11'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
@ -97,21 +106,24 @@ applications:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '12'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '13'
channel: candidate
relations:

24
tests/bundles/trusty-mitaka.yaml
View File

@ -37,47 +37,55 @@ applications:
max-connections: 1000
source: cloud:trusty-mitaka
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:trusty-mitaka
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:trusty-mitaka
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:trusty-mitaka
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: trusty
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/xenial-mitaka.yaml
View File

@ -30,48 +30,57 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: xenial
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/xenial-ocata.yaml
View File

@ -30,54 +30,63 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-ocata
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-ocata
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-ocata
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-ocata
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: xenial
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/xenial-pike.yaml
View File

@ -30,54 +30,63 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-pike
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-pike
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-pike
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-pike
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: xenial
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

27
tests/bundles/xenial-queens.yaml
View File

@ -30,54 +30,63 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-queens
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-queens
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-queens
channel: candidate
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-queens
channel: candidate
cinder-backup:
charm: ../../../cinder-backup
series: xenial
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate

13
tox.ini
View File

@ -22,19 +22,22 @@ skip_missing_interpreters = False
# * It is also necessary to pin virtualenv as a newer virtualenv would still
# lead to fetching the latest pip in the func* tox targets, see
# https://stackoverflow.com/a/38133283
requires = pip < 20.3
virtualenv < 20.0
requires =
pip < 20.3
virtualenv < 20.0
setuptools < 50.0.0
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
minversion = 3.2.0
minversion = 3.18.0
[testenv]
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
CHARM_DIR={envdir}
install_command =
pip install {opts} {packages}
{toxinidir}/pip.sh install {opts} {packages}
commands = stestr run --slowest {posargs}
whitelist_externals = juju
allowlist_externals = juju
passenv = HOME TERM CS_* OS_* TEST_*
deps = -r{toxinidir}/test-requirements.txt