Remove disco support from the charm
Change-Id: I27742bf018d968c2917f6ed1cf5fb903a166254c
This commit is contained in:
parent
98b0eb1178
commit
76af82b8c4
|
@ -13,7 +13,6 @@ series:
|
||||||
- xenial
|
- xenial
|
||||||
- bionic
|
- bionic
|
||||||
- eoan
|
- eoan
|
||||||
- disco
|
|
||||||
- trusty
|
- trusty
|
||||||
provides:
|
provides:
|
||||||
amqp:
|
amqp:
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: disco
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nrpe:nrpe-external-master
|
|
||||||
- rabbitmq-server:nrpe-external-master
|
|
||||||
|
|
||||||
applications:
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: "../../../rabbitmq-server"
|
|
||||||
num_units: 3
|
|
||||||
constraints:
|
|
||||||
cpu-cores=2
|
|
||||||
options:
|
|
||||||
min-cluster-size: 3
|
|
||||||
max-cluster-tries: 6
|
|
||||||
ssl: "off"
|
|
||||||
management_plugin: "False"
|
|
||||||
stats_cron_schedule: "*/1 * * * *"
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
max-connections: 1000
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
admin-password: openstack
|
|
||||||
admin-token: ubuntutesting
|
|
||||||
nrpe:
|
|
||||||
charm: cs:nrpe
|
|
|
@ -12,7 +12,5 @@ gate_bundles:
|
||||||
- bionic-stein
|
- bionic-stein
|
||||||
- bionic-train
|
- bionic-train
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
# Tests failing, investigate
|
|
||||||
- disco-stein
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
|
- zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
|
||||||
|
|
Loading…
Reference in New Issue