openstack
/
charm-ceph-rbd-mirror
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch tests to stable.

Switch to using stable charm-helpers branch.

Switch to using stable charm.openstack branch.

Change-Id: Ieb1034d094e3f2ab73dc2955191ff071bf8c6060
This commit is contained in:
Alex Kavanagh 2020-08-13 11:29:21 +01:00
parent d7bec5f8b8
commit 98cb820182
12 changed files with 99 additions and 94 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-ceph-rbd-mirror.git
defaultbranch=stable/20.08

26
src/tests/bundles/bionic-queens-e2e-lxd.yaml
View File

@ -26,28 +26,28 @@ machines:
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:0
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:2
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
@ -56,32 +56,32 @@ applications:
to:
- lxd:0
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:1
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:2
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- 0
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -94,7 +94,7 @@ applications:
- lxd:1
- lxd:2
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro
@ -118,7 +118,7 @@ applications:
to:
- 3
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -131,7 +131,7 @@ applications:
- lxd:5
- lxd:6
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro

26
src/tests/bundles/bionic-queens-e2e.yaml
View File

@ -26,28 +26,28 @@ machines:
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:0
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:2
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
@ -56,32 +56,32 @@ applications:
to:
- lxd:0
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:1
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
bindings:
'': libvirt-maas
to:
- lxd:2
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- 0
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -94,7 +94,7 @@ applications:
- lxd:1
- lxd:2
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro
@ -118,7 +118,7 @@ applications:
to:
- 3
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -131,7 +131,7 @@ applications:
- lxd:5
- lxd:6
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro

22
src/tests/bundles/bionic-queens.yaml
View File

@ -1,45 +1,45 @@
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: distro
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: distro
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: distro
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: distro
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: distro
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro
@ -53,13 +53,13 @@ applications:
options:
source: distro
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: distro
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: distro

18
src/tests/bundles/bionic-rocky-site-a.yaml
View File

@ -1,47 +1,47 @@
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: cloud:bionic-rocky
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: cloud:bionic-rocky
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-rocky
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-rocky

4
src/tests/bundles/bionic-rocky-site-b.yaml
View File

@ -1,13 +1,13 @@
series: bionic
applications:
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-rocky
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-rocky

22
src/tests/bundles/bionic-rocky.yaml
View File

@ -1,47 +1,47 @@
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: cloud:bionic-rocky
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: cloud:bionic-rocky
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-rocky
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-rocky
@ -55,13 +55,13 @@ applications:
options:
source: cloud:bionic-rocky
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-rocky
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-rocky

22
src/tests/bundles/bionic-stein.yaml
View File

@ -1,47 +1,47 @@
series: bionic
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: cloud:bionic-stein
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: cloud:bionic-stein
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-stein
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-stein
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-stein
@ -55,13 +55,13 @@ applications:
options:
source: cloud:bionic-stein
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-stein
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-stein

22
src/tests/bundles/xenial-pike.yaml
View File

@ -1,48 +1,48 @@
series: xenial
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: cloud:xenial-pike
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: cloud:xenial-pike
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
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-pike
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-pike
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:xenial-pike
@ -56,13 +56,13 @@ applications:
options:
source: cloud:xenial-pike
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-pike
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:xenial-pike

22
src/tests/bundles/xenial-queens.yaml
View File

@ -1,48 +1,48 @@
series: xenial
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: cloud:xenial-queens
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: cloud:xenial-queens
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
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-queens
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-queens
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:xenial-queens
@ -56,13 +56,13 @@ applications:
options:
source: cloud:xenial-queens
ceph-mon-b:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-queens
ceph-osd-b:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:xenial-queens

5
src/wheelhouse.txt
View File

@ -1,2 +1,5 @@
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers

2
test-requirements.txt
View File

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