Remove Disco and Eoan bits
Change-Id: I78304050f8d9c73c3774f041e5dcbac3f9522c25
This commit is contained in:
parent
911730b11d
commit
b7abbd905a
|
@ -15,7 +15,6 @@ tags:
|
|||
series:
|
||||
- xenial
|
||||
- bionic
|
||||
- eoan
|
||||
- focal
|
||||
- trusty
|
||||
- groovy
|
||||
|
@ -27,4 +26,4 @@ resources:
|
|||
policyd-override:
|
||||
type: file
|
||||
filename: policyd-override.zip
|
||||
description: The policy.d overrides file
|
||||
description: The policy.d overrides file
|
||||
|
|
|
@ -1,121 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series eoan
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10: {}
|
||||
11: {}
|
||||
12: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
aodh:
|
||||
series: *series
|
||||
charm: ../../../aodh
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers-next/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
gnocchi:
|
||||
charm: cs:~openstack-charmers-next/gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
relations:
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
- - 'aodh:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'aodh:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'aodh:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - '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'
|
|
@ -16,8 +16,6 @@ gate_bundles:
|
|||
- trusty-mitaka
|
||||
smoke_bundles:
|
||||
- bionic-train
|
||||
dev_bundles:
|
||||
- eoan-train
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.aodh.tests.AodhTest
|
||||
configure:
|
||||
|
|
Loading…
Reference in New Issue