openstack
/
charm-gnocchi
Code Issues Proposed changes

21.10 - Release 

Remove the "channel: candidate" from the func-test
bundles.

Change-Id: I49bce31c6bdf100450bde4585f5c2ddd44f491d3
This commit is contained in:
Alex Kavanagh 2021-10-21 14:49:40 +01:00
parent 0db3935e31
commit 6e056ea44f
25 changed files with 0 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

6
src/tests/bundles/bionic-stein-s3.yaml
View File

@ -25,7 +25,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -33,7 +32,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -41,7 +39,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -49,7 +46,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -86,14 +82,12 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

6
src/tests/bundles/bionic-train-s3.yaml
View File

@ -25,7 +25,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -33,7 +32,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -41,7 +39,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -49,7 +46,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -86,14 +82,12 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

6
src/tests/bundles/bionic-ussuri-s3.yaml
View File

@ -25,7 +25,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -33,7 +32,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -41,7 +39,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -49,7 +46,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -86,14 +82,12 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

9
src/tests/bundles/focal-ussuri-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/focal-victoria-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/focal-wallaby-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

8
src/tests/bundles/focal-wallaby.yaml
View File

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/focal-xena-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

8
src/tests/bundles/focal-xena.yaml
View File

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/groovy-victoria-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/hirsute-wallaby-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

8
src/tests/bundles/hirsute-wallaby.yaml
View File

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

9
src/tests/bundles/impish-xena-s3.yaml
View File

@ -26,13 +26,10 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +40,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -51,7 +47,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -59,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -67,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -105,14 +98,12 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

8
src/tests/bundles/impish-xena.yaml
View File

@ -29,10 +29,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -43,7 +41,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@ -52,7 +49,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -61,7 +57,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
@ -70,7 +65,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@ -83,7 +77,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@ -96,7 +89,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -29,7 +29,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -37,7 +36,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -45,7 +43,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -53,7 +50,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -65,7 +61,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -77,7 +72,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

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

@ -29,7 +29,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -37,7 +36,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -45,7 +43,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -53,7 +50,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -65,7 +61,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -77,7 +72,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi

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

@ -28,7 +28,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -36,7 +35,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -44,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers/ceilometer
num_units: 1
@ -52,7 +49,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
@ -64,7 +60,6 @@ applications:
- '4'
- '5'
- '6'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
@ -76,7 +71,6 @@ applications:
- '7'
- '8'
- '9'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi