From ba7b42e36c1d527433852e3fbb93b64248b9f9b7 Mon Sep 17 00:00:00 2001 From: David Ames Date: Wed, 18 Jul 2018 12:04:10 -0700 Subject: [PATCH] Use the provider network for router id The router id for the dragent must be on the provider network. The charm was using the BGP speaker_ip which is only used for related test services. (i.e. quagga). This change guarantees the router id uses the provider extra binding IP. It also sets the group ownership to neutron for rendered config files. Closes-Bug: #1782433 Partial-Bug: #1782444 Change-Id: I4761b4c5b80a398e13e4cdf880b773df489f53b9 --- src/lib/charm/openstack/dragent.py | 1 + src/templates/bgp_dragent.ini | 2 +- .../bundles/bionic-queens-functional.yaml | 16 ++++++++++++++-- .../bundles/xenial-ocata-functional.yaml | 18 ++++++++++++++++-- src/tests/bundles/xenial-pike-functional.yaml | 19 ++++++++++++++++--- .../bundles/xenial-queens-functional.yaml | 19 ++++++++++++++++--- 6 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/lib/charm/openstack/dragent.py b/src/lib/charm/openstack/dragent.py index 845a3df..f28853b 100644 --- a/src/lib/charm/openstack/dragent.py +++ b/src/lib/charm/openstack/dragent.py @@ -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, diff --git a/src/templates/bgp_dragent.ini b/src/templates/bgp_dragent.ini index fdbd1a0..a624d17 100644 --- a/src/templates/bgp_dragent.ini +++ b/src/templates/bgp_dragent.ini @@ -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}} diff --git a/src/tests/bundles/bionic-queens-functional.yaml b/src/tests/bundles/bionic-queens-functional.yaml index f8b96ad..0f29786 100644 --- a/src/tests/bundles/bionic-queens-functional.yaml +++ b/src/tests/bundles/bionic-queens-functional.yaml @@ -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 diff --git a/src/tests/bundles/xenial-ocata-functional.yaml b/src/tests/bundles/xenial-ocata-functional.yaml index 994e76d..fd2ec26 100644 --- a/src/tests/bundles/xenial-ocata-functional.yaml +++ b/src/tests/bundles/xenial-ocata-functional.yaml @@ -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 diff --git a/src/tests/bundles/xenial-pike-functional.yaml b/src/tests/bundles/xenial-pike-functional.yaml index b3a0427..7503440 100644 --- a/src/tests/bundles/xenial-pike-functional.yaml +++ b/src/tests/bundles/xenial-pike-functional.yaml @@ -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 - diff --git a/src/tests/bundles/xenial-queens-functional.yaml b/src/tests/bundles/xenial-queens-functional.yaml index ee491d9..7801858 100644 --- a/src/tests/bundles/xenial-queens-functional.yaml +++ b/src/tests/bundles/xenial-queens-functional.yaml @@ -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 -