openstack
/
charm-aodh
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch to using stable charm-helpers branch.

Change-Id: Ib18b39422f6732db79a85878281530a4133beb31
This commit is contained in:
David Ames 2019-10-24 12:20:57 -07:00
parent 3be96df033
commit 6e3d50cd03
12 changed files with 64 additions and 60 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/19.10

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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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:gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

14
src/tests/bundles/eoan-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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin

8
src/tests/bundles/xenial-ocata.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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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: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: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:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs: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: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:gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin

2
src/wheelhouse.txt
View File

@ -1,3 +1,5 @@
jinja2
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/19.10#egg=charms.openstack