Remove disco support from the charm
Change-Id: I6530b80dddfa84e6602bbfa5d1098c26e2ad77a0
This commit is contained in:
parent
844226fe1f
commit
8a27f05c3c
|
@ -10,7 +10,6 @@ series:
|
|||
- xenial
|
||||
- bionic
|
||||
- eoan
|
||||
- disco
|
||||
subordinate: false
|
||||
extra-bindings:
|
||||
# Used to specify the OpenStack provider network interface
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
series: disco
|
||||
relations:
|
||||
- [neutron-dynamic-routing, rabbitmq-server]
|
||||
- [neutron-dynamic-routing, quagga]
|
||||
- [keystone, mysql]
|
||||
- [neutron-api, mysql]
|
||||
- [neutron-api, rabbitmq-server]
|
||||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options:
|
||||
haproxy-server-timeout: 90000
|
||||
haproxy-client-timeout: 90000
|
||||
haproxy-queue-timeout: 9000
|
||||
haproxy-connect-timeout: 9000
|
||||
series: disco
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
||||
constraints: mem=4G
|
||||
num_units: 1
|
||||
series: disco
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options:
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
haproxy-server-timeout: 90000
|
||||
haproxy-client-timeout: 90000
|
||||
haproxy-queue-timeout: 9000
|
||||
haproxy-connect-timeout: 9000
|
||||
series: disco
|
||||
neutron-dynamic-routing:
|
||||
charm: ../../../neutron-dynamic-routing
|
||||
num_units: 1
|
||||
series: disco
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
series: disco
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
num_units: 1
|
||||
series: disco
|
||||
|
|
@ -2,7 +2,6 @@ charm_name: neutron-dynamic-routing
|
|||
configure:
|
||||
- zaza.openstack.charm_tests.dragent.configure.setup
|
||||
dev_bundles:
|
||||
- disco-stein-functional
|
||||
gate_bundles:
|
||||
- bionic-train-functional
|
||||
- bionic-stein-functional
|
||||
|
|
Loading…
Reference in New Issue