openstack
/
charm-gnocchi
Code Issues Proposed changes

Add focal-ussuri and bionic-ussuri bundle 

This patch adds a focal-ussuri and bionic-ussuri bundles to the tests
for the charm.

Change-Id: I4330c194c860ad7ada59136cbf37cf03fb9535dc
This commit is contained in:
Alex Kavanagh 2020-04-02 18:11:53 +01:00
parent d8c5f32550
commit 8ed410eb33
5 changed files with 259 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/charm/openstack/gnocchi.py
View File

@ -251,6 +251,8 @@ class GnocchiQueensCharm(GnocchiCharm):
release = 'queens'
python_version = 3
packages = ['gnocchi-api', 'gnocchi-metricd', 'python3-apt',
'ceph-common', 'python3-rados', 'python3-keystonemiddleware',
'python3-memcache']

1
src/metadata.yaml
View File

@ -13,6 +13,7 @@ series:
- xenial
- bionic
- eoan
- focal
provides:
metric-service:
interface: gnocchi

107
src/tests/bundles/bionic-ussuri.yaml Normal file
View File

@ -0,0 +1,107 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-ussuri
series: &series bionic
machines:
0:
constraints: "mem=3072M"
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
expected-osd-count: 3
monitor-count: '3'
source: *openstack-origin
to:
- '7'
- '8'
- '9'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '10'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '11'
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'

144
src/tests/bundles/focal-ussuri.yaml Normal file
View File

@ -0,0 +1,144 @@
variables:
openstack-origin: &openstack-origin distro
series: &series focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
series: bionic
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
expected-osd-count: 3
monitor-count: '3'
source: *openstack-origin
to:
- '9'
- '10'
- '11'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# holding at bionic as memcached doesn't support focal yet
series: bionic
to:
- '13'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'

5
src/tests/tests.yaml
View File

@ -8,6 +8,8 @@ gate_bundles:
- bionic-rocky
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
smoke_bundles:
- bionic-train
dev_bundles:
@ -23,3 +25,6 @@ target_deploy_status:
mongodb:
workload-status: unknown
workload-status-message: ''
tests_options:
force_deploy:
- focal-ussuri