openstack
/
charm-ceilometer
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: Ib2afbb966a9e8cf9b24858ff46baea2b48ce39fc
This commit is contained in:
Alex Kavanagh 2020-08-13 11:27:37 +01:00
parent 7c0ecdbd1a
commit 42855abd0f
16 changed files with 156 additions and 154 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-ceilometer.git
defaultbranch=stable/20.08

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

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

@ -17,7 +17,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -25,7 +25,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -35,7 +35,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -44,29 +44,29 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '12'
@ -75,12 +75,12 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -19,7 +19,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -27,7 +27,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -37,7 +37,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -48,7 +48,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -57,28 +57,28 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -91,14 +91,14 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -19,7 +19,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -27,7 +27,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -37,7 +37,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -48,7 +48,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -57,28 +57,28 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -91,14 +91,14 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -20,7 +20,7 @@ machines:
15: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -28,7 +28,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -38,7 +38,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -49,7 +49,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -58,35 +58,35 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
to:
- '12'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -99,14 +99,14 @@ applications:
to:
- '14'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '15'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -20,7 +20,7 @@ machines:
15:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -28,7 +28,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -38,7 +38,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -49,7 +49,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -58,35 +58,35 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
to:
- '12'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -99,14 +99,14 @@ applications:
to:
- '14'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '15'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

20
tests/bundles/disco-stein.yaml
View File

@ -17,7 +17,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -25,7 +25,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -35,7 +35,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -44,29 +44,29 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '12'
@ -75,12 +75,12 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-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
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -137,7 +137,7 @@ applications:
- '16'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -145,7 +145,7 @@ applications:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:

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

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-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
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -137,7 +137,7 @@ applications:
- '16'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -145,7 +145,7 @@ applications:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:

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

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-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
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -137,7 +137,7 @@ applications:
- '16'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -145,7 +145,7 @@ applications:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:

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

@ -17,7 +17,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -27,28 +27,28 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -61,7 +61,7 @@ applications:
to:
- '7'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -10,12 +10,12 @@ machines:
7: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -25,22 +25,22 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '6'
@ -49,7 +49,7 @@ applications:
to:
- '7'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -20,7 +20,7 @@ machines:
15: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -28,7 +28,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -38,7 +38,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -49,7 +49,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -58,28 +58,28 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -92,14 +92,14 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
mongodb:
num_units: 1
charm: cs:xenial/mongodb

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

@ -19,7 +19,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -27,7 +27,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -37,7 +37,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -48,7 +48,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -57,28 +57,28 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -91,14 +91,14 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'

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

@ -19,7 +19,7 @@ machines:
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -27,7 +27,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -37,7 +37,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -48,7 +48,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -57,28 +57,28 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
@ -91,14 +91,14 @@ applications:
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers-next/ceilometer-agent
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'