openstack
/
charm-neutron-dynamic-routing
Code Issues Proposed changes

Merge "Use the provider network for router id"

This commit is contained in:
Zuul 2018-07-20 18:29:26 +00:00 committed by Gerrit Code Review
parent 54033bec63 ba7b42e36c
commit 96940b95b1
6 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/charm/openstack/dragent.py
View File

@ -184,6 +184,7 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm):
services = [default_service]
required_relations = ['amqp']
adapters_class = DRAgentRelationAdapters
group = 'neutron'
restart_map = {
NEUTRON_CONF: services,

2
src/templates/bgp_dragent.ini
View File

@ -11,4 +11,4 @@
bgp_speaker_driver = neutron_dynamic_routing.services.bgp.agent.driver.ryu.driver.RyuBgpDriver
# 32-bit BGP identifier, typically an IPv4 address owned by the system running the BGP DrAgent. (string value)
bgp_router_id = {{options.speaker_ip}}
bgp_router_id = {{options.provider_ip}}

16
src/tests/bundles/bionic-queens-functional.yaml
View File

@ -11,7 +11,13 @@ applications:
charm: cs:~openstack-charmers-next/bionic/keystone
constraints: mem=1G
num_units: 1
options: {admin-password: openstack, admin-token: ubuntutesting}
options:
admin-password: openstack
admin-token: ubuntutesting
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: bionic
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
@ -22,7 +28,13 @@ applications:
charm: cs:~openstack-charmers-next/bionic/neutron-api
constraints: mem=1G
num_units: 1
options: {flat-network-providers: physnet1, neutron-security-groups: true}
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: bionic
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing

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

@ -11,7 +11,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options: {admin-password: openstack, admin-token: ubuntutesting, openstack-origin: 'cloud:xenial-ocata'}
options:
admin-password: openstack
admin-token: ubuntutesting
openstack-origin: 'cloud:xenial-ocata'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
@ -23,7 +30,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-ocata'}
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: 'cloud:xenial-ocata'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing

19
src/tests/bundles/xenial-pike-functional.yaml
View File

@ -11,7 +11,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options: {admin-password: openstack, admin-token: ubuntutesting, openstack-origin: 'cloud:xenial-pike'}
options:
admin-password: openstack
admin-token: ubuntutesting
openstack-origin: 'cloud:xenial-pike'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
@ -23,7 +30,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-pike'}
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: 'cloud:xenial-pike'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
@ -41,4 +55,3 @@ applications:
num_units: 1
options: {use-16bit-asn: True}
series: xenial

19
src/tests/bundles/xenial-queens-functional.yaml
View File

@ -10,7 +10,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options: {admin-password: openstack, admin-token: ubuntutesting, openstack-origin: 'cloud:xenial-queens'}
options:
admin-password: openstack
admin-token: ubuntutesting
openstack-origin: 'cloud:xenial-queens'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
@ -22,7 +29,14 @@ applications:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-queens'}
options:
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: 'cloud:xenial-queens'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
@ -39,4 +53,3 @@ applications:
charm: cs:~openstack-charmers-next/xenial/quagga
num_units: 1
series: xenial