openstack
/
charm-aodh
Code Issues Proposed changes

Updates for stable branch creation 21.01 

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.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: Ic2a78d1965026a8b7e06012203c04850b303ca23
This commit is contained in:
Aurelien Lourot 2021-02-10 19:57:15 +01:00
parent 62aa75b7ab
commit e299dba50b
17 changed files with 100 additions and 98 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-aodh.git
defaultbranch=stable/21.01

4
src/test-requirements.txt
View File

@ -11,5 +11,5 @@ charm-tools>=2.4.4
keyring<21
# 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-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack

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

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

14
src/tests/bundles/bionic-train.yaml
View File

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

14
src/tests/bundles/bionic-ussuri.yaml
View File

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

20
src/tests/bundles/focal-ussuri.yaml
View File

@ -29,14 +29,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
aodh-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
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
@ -52,7 +52,7 @@ applications:
- '3'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
@ -60,7 +60,7 @@ applications:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -68,7 +68,7 @@ applications:
- '5'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -76,7 +76,7 @@ applications:
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -88,7 +88,7 @@ applications:
- '9'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -100,7 +100,7 @@ applications:
- '12'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

20
src/tests/bundles/focal-victoria.yaml
View File

@ -29,14 +29,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
aodh-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
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
@ -52,7 +52,7 @@ applications:
- '3'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
@ -60,7 +60,7 @@ applications:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -68,7 +68,7 @@ applications:
- '5'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -76,7 +76,7 @@ applications:
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -88,7 +88,7 @@ applications:
- '9'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -100,7 +100,7 @@ applications:
- '12'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

20
src/tests/bundles/groovy-victoria.yaml
View File

@ -29,14 +29,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
aodh-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
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
@ -52,7 +52,7 @@ applications:
- '3'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '4'
@ -60,7 +60,7 @@ applications:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -68,7 +68,7 @@ applications:
- '5'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -76,7 +76,7 @@ applications:
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -88,7 +88,7 @@ applications:
- '9'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -100,7 +100,7 @@ applications:
- '12'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

6
src/tests/bundles/trusty-mitaka.yaml
View File

@ -31,21 +31,21 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin

8
src/tests/bundles/xenial-mitaka.yaml
View File

@ -16,7 +16,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -31,21 +31,21 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin

14
src/tests/bundles/xenial-ocata.yaml
View File

@ -24,7 +24,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -39,28 +39,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -71,7 +71,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -82,7 +82,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -24,7 +24,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -39,28 +39,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -71,7 +71,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -82,7 +82,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -23,7 +23,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
@ -38,28 +38,28 @@ applications:
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -70,7 +70,7 @@ applications:
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -81,7 +81,7 @@ applications:
- '9'
- '10'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

4
src/wheelhouse.txt
View File

@ -2,6 +2,6 @@
Jinja2<=2.10.1
psutil
git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers

2
test-requirements.txt
View File

@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
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/21.01#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault