openstack
/
charm-gnocchi
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: I63b3fff88998221fa3ce0cdfb2483d258355584b
This commit is contained in:
Aurelien Lourot 2021-02-10 20:06:33 +01:00
parent 710ef8118a
commit e0611ab5d6
21 changed files with 124 additions and 122 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 host=review.opendev.org
port=29418 port=29418
project=openstack/charm-gnocchi.git project=openstack/charm-gnocchi.git
defaultbranch=stable/21.01

4
src/test-requirements.txt
View File

@ -11,5 +11,5 @@ charm-tools>=2.4.4
keyring<21 keyring<21
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) # 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.git@stable/21.01#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack

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

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

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

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

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

@ -19,28 +19,28 @@ machines:
# time, given that machine "0" comes up way before machine "6" # time, given that machine "0" comes up way before machine "6"
applications: applications:
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '0' - '0'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '1' - '1'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -73,7 +73,7 @@ applications:
to: to:
- '6' - '6'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -83,7 +83,7 @@ applications:
to: to:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

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

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

@ -19,28 +19,28 @@ machines:
# time, given that machine "0" comes up way before machine "6" # time, given that machine "0" comes up way before machine "6"
applications: applications:
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '0' - '0'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '1' - '1'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -73,7 +73,7 @@ applications:
to: to:
- '6' - '6'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -83,7 +83,7 @@ applications:
to: to:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

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

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

@ -19,28 +19,28 @@ machines:
# time, given that machine "0" comes up way before machine "6" # time, given that machine "0" comes up way before machine "6"
applications: applications:
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '0' - '0'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '1' - '1'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -73,7 +73,7 @@ applications:
to: to:
- '6' - '6'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -83,7 +83,7 @@ applications:
to: to:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

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

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

@ -25,14 +25,14 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -41,21 +41,21 @@ applications:
- '1' - '1'
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -89,7 +89,7 @@ applications:
to: to:
- '7' - '7'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -99,7 +99,7 @@ applications:
to: to:
- '8' - '8'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

@ -28,12 +28,12 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -43,7 +43,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -51,7 +51,7 @@ applications:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -59,7 +59,7 @@ applications:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -67,7 +67,7 @@ applications:
- '5' - '5'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
storage: storage:
osd-devices: 'cinder,10G' osd-devices: 'cinder,10G'
@ -79,7 +79,7 @@ applications:
- '8' - '8'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
expected-osd-count: 3 expected-osd-count: 3

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

@ -25,14 +25,14 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -41,21 +41,21 @@ applications:
- '1' - '1'
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -89,7 +89,7 @@ applications:
to: to:
- '7' - '7'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -99,7 +99,7 @@ applications:
to: to:
- '8' - '8'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

@ -28,12 +28,12 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -43,7 +43,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -51,7 +51,7 @@ applications:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -59,7 +59,7 @@ applications:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -67,7 +67,7 @@ applications:
- '5' - '5'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
storage: storage:
osd-devices: 'cinder,10G' osd-devices: 'cinder,10G'
@ -79,7 +79,7 @@ applications:
- '8' - '8'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
expected-osd-count: 3 expected-osd-count: 3

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

@ -25,14 +25,14 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -41,21 +41,21 @@ applications:
- '1' - '1'
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
to: to:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -89,7 +89,7 @@ applications:
to: to:
- '7' - '7'
swift-storage: swift-storage:
charm: cs:~openstack-charmers-next/swift-storage charm: cs:~openstack-charmers/swift-storage
num_units: 1 num_units: 1
storage: storage:
block-devices: 'cinder,10G' block-devices: 'cinder,10G'
@ -99,7 +99,7 @@ applications:
to: to:
- '8' - '8'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
series: *series series: *series
to: to:

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

@ -28,12 +28,12 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router: gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -43,7 +43,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -51,7 +51,7 @@ applications:
- '3' - '3'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -59,7 +59,7 @@ applications:
- '4' - '4'
ceilometer: ceilometer:
charm: cs:~openstack-charmers-next/ceilometer charm: cs:~openstack-charmers/ceilometer
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -67,7 +67,7 @@ applications:
- '5' - '5'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
storage: storage:
osd-devices: 'cinder,10G' osd-devices: 'cinder,10G'
@ -79,7 +79,7 @@ applications:
- '8' - '8'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
expected-osd-count: 3 expected-osd-count: 3

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

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

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

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

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

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

4
src/wheelhouse.txt
View File

@ -1,5 +1,5 @@
boto3 boto3
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 nose>=1.3.7
coverage>=3.6 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: # Revisit for removal / mock improvement:
netifaces # vault netifaces # vault