openstack
/
charm-gnocchi
Code Issues Proposed changes

21.10 - Stable cut of charms for testing period 

* use stable/21.10 libraries
* use zaza/zaza-openstack-tests at stable/21.10
* build.lock files for reactive charms
* bundles refer to ~openstack-charms candidate channel

Change-Id: I925cdcf5a09baaacb4cb134b2f881e9f59e02241
This commit is contained in:
Alex Kavanagh 2021-10-11 19:04:12 +01:00
parent 80f5e3263e
commit f5ee92816f
30 changed files with 650 additions and 190 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-gnocchi.git
defaultbranch=stable/21.10

272
src/build.lock Normal file
View File

@ -0,0 +1,272 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb"
},
{
"type": "layer",
"item": "layer:openstack-principle",
"url": "https://github.com/openstack/charm-layer-openstack-principle",
"vcs": null,
"branch": "refs/heads/master",
"commit": "8100de4b24ab361423363c75599124708169d871"
},
{
"type": "layer",
"item": "layer:openstack-api",
"url": "https://github.com/openstack/charm-layer-openstack-api",
"vcs": null,
"branch": "refs/heads/master",
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
},
{
"type": "layer",
"item": "gnocchi",
"url": null,
"vcs": null,
"branch": "refs/heads/21.10-updates\nrefs/heads/master",
"commit": "refs/heads/21.10-updates\nrefs/heads/master"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:mysql-shared",
"url": "https://github.com/openstack/charm-interface-mysql-shared",
"vcs": null,
"branch": "refs/heads/master",
"commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
},
{
"type": "layer",
"item": "interface:rabbitmq",
"url": "https://github.com/openstack/charm-interface-rabbitmq",
"vcs": null,
"branch": "refs/heads/master",
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
},
{
"type": "layer",
"item": "interface:keystone",
"url": "https://github.com/openstack/charm-interface-keystone",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "8125a7baecccf9b0869e515b92300dde3a86f31b"
},
{
"type": "layer",
"item": "interface:openstack-ha",
"url": "https://github.com/openstack/charm-interface-openstack-ha",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
},
{
"type": "layer",
"item": "interface:ceph-client",
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
"vcs": null,
"branch": null,
"commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f"
},
{
"type": "layer",
"item": "interface:gnocchi",
"url": "https://github.com/openstack/charm-interface-gnocchi",
"vcs": null,
"branch": "refs/heads/master",
"commit": "9efd83a5728bee385a93887e8669a513e198a8fe"
},
{
"type": "layer",
"item": "interface:memcache",
"url": "https://github.com/omnivector-solutions/interface-memcache.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "ab0958e171093f151427eaf62afdf9ae8c20ed0d"
},
{
"type": "python_module",
"package": "python-dateutil",
"vcs": null,
"version": "2.8.2"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.6.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "jmespath",
"vcs": null,
"version": "0.10.0"
},
{
"type": "python_module",
"package": "botocore",
"vcs": null,
"version": "1.21.58"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "s3transfer",
"vcs": null,
"version": "0.5.0"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.10",
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
"vcs": "git"
},
{
"type": "python_module",
"package": "boto3",
"vcs": null,
"version": "1.18.58"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.10",
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "urllib3",
"vcs": null,
"version": "1.26.7"
}
]
}

4
src/test-requirements.txt
View File

@ -5,5 +5,5 @@
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack

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

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

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

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

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

@ -19,33 +19,37 @@ machines:
# time, given that machine "0" comes up way before machine "6"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -73,7 +77,7 @@ applications:
to:
- '6'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -82,12 +86,14 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

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

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

@ -19,33 +19,37 @@ machines:
# time, given that machine "0" comes up way before machine "6"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -73,7 +77,7 @@ applications:
to:
- '6'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -82,12 +86,14 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

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

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

@ -19,33 +19,37 @@ machines:
# time, given that machine "0" comes up way before machine "6"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -73,7 +77,7 @@ applications:
to:
- '6'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -82,12 +86,14 @@ applications:
zone: 1
to:
- '7'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '8'
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

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

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

@ -25,14 +25,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -40,27 +43,31 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
gnocchi:
series: *series
charm: ../../../gnocchi
@ -89,7 +96,7 @@ applications:
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
@ -98,12 +105,14 @@ applications:
zone: 1
to:
- '8'
channel: candidate
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
num_units: 1
series: *series
to:
- '9'
channel: candidate
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db

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

@ -28,12 +28,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -41,33 +43,37 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -77,9 +83,10 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
expected-osd-count: 3
@ -89,6 +96,7 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
gnocchi:
series: *series

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

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

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

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

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

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

4
src/wheelhouse.txt
View File

@ -1,5 +1,5 @@
boto3
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers

3
test-requirements.txt
View File

@ -3,6 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
stestr>=2.2.0
@ -33,7 +34,7 @@ mock>=1.2; python_version >= '3.6'
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#