From bbc20dbe49e13fc2166cfae3a10eff57cad56553 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 19 Jun 2019 13:51:04 +0000 Subject: [PATCH] Stop using veth pairs to connect qdhcp ns veth pairs are currently being used to connect the qdhcp namespace to the underlying bridge. This behaviour appears to only be needed for old kernels with limited namespaces support (pre trusty). Change-Id: I3b090f07c995cbf375dcc1dfdbadf0d7f10ec78e Closes-Bug: #1832021 --- templates/icehouse/dhcp_agent.ini | 3 +-- templates/icehouse/l3_agent.ini | 4 +--- templates/juno/l3_agent.ini | 4 +--- templates/mitaka/dhcp_agent.ini | 3 +-- templates/mitaka/l3_agent.ini | 4 +--- templates/newton/l3_agent.ini | 4 +--- templates/queens/l3_agent.ini | 4 +--- templates/stein/l3_agent.ini | 4 +--- tests/basic_deployment.py | 4 ---- 9 files changed, 8 insertions(+), 26 deletions(-) diff --git a/templates/icehouse/dhcp_agent.ini b/templates/icehouse/dhcp_agent.ini index ff1ff906..4fe46e8f 100644 --- a/templates/icehouse/dhcp_agent.ini +++ b/templates/icehouse/dhcp_agent.ini @@ -17,12 +17,11 @@ enable_metadata_network = True enable_isolated_metadata = True {% endif -%} +ovs_use_veth = False {% if plugin == 'n1kv' %} enable_metadata_network = True enable_isolated_metadata = True resync_interval = 30 use_namespaces = True dhcp_lease_time=3600 -{% else %} -ovs_use_veth = True {% endif %} diff --git a/templates/icehouse/l3_agent.ini b/templates/icehouse/l3_agent.ini index 0f5de24e..2a59a467 100644 --- a/templates/icehouse/l3_agent.ini +++ b/templates/icehouse/l3_agent.ini @@ -11,13 +11,11 @@ admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/templates/juno/l3_agent.ini b/templates/juno/l3_agent.ini index 6376978b..997a9a93 100644 --- a/templates/juno/l3_agent.ini +++ b/templates/juno/l3_agent.ini @@ -11,13 +11,11 @@ admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/templates/mitaka/dhcp_agent.ini b/templates/mitaka/dhcp_agent.ini index b70d74c5..fc11c1c7 100644 --- a/templates/mitaka/dhcp_agent.ini +++ b/templates/mitaka/dhcp_agent.ini @@ -28,10 +28,9 @@ dhcp_domain = {{ dns_domain }} enable_metadata_network = {{ enable_metadata_network }} enable_isolated_metadata = {{ enable_isolated_metadata }} +ovs_use_veth = False {% if plugin == 'n1kv' %} resync_interval = 30 use_namespaces = True dhcp_lease_time=3600 -{% else %} -ovs_use_veth = True {% endif %} diff --git a/templates/mitaka/l3_agent.ini b/templates/mitaka/l3_agent.ini index 2342e869..23b379bd 100644 --- a/templates/mitaka/l3_agent.ini +++ b/templates/mitaka/l3_agent.ini @@ -11,13 +11,11 @@ admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/templates/newton/l3_agent.ini b/templates/newton/l3_agent.ini index 4ff0c2cc..18f1ae0d 100644 --- a/templates/newton/l3_agent.ini +++ b/templates/newton/l3_agent.ini @@ -12,13 +12,11 @@ admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/templates/queens/l3_agent.ini b/templates/queens/l3_agent.ini index d5e003e3..68b64ad5 100644 --- a/templates/queens/l3_agent.ini +++ b/templates/queens/l3_agent.ini @@ -7,13 +7,11 @@ interface_driver = openvswitch root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/templates/stein/l3_agent.ini b/templates/stein/l3_agent.ini index 78fee431..4fcec16e 100644 --- a/templates/stein/l3_agent.ini +++ b/templates/stein/l3_agent.ini @@ -7,13 +7,11 @@ interface_driver = openvswitch root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf handle_internal_only_routers = {{ handle_internal_only_router }} +ovs_use_veth = False {% if plugin == 'n1kv' %} l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport external_network_bridge = br-int -ovs_use_veth = False use_namespaces = True -{% else %} -ovs_use_veth = True {% endif %} {% if external_configuration_new -%} gateway_external_network_id = diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index c46987ad..d3a30449 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -562,7 +562,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 'dhcp_driver': 'neutron.agent.linux.dhcp.Dnsmasq', 'root_helper': 'sudo /usr/bin/neutron-rootwrap ' '/etc/neutron/rootwrap.conf', - 'ovs_use_veth': 'True' } section = 'DEFAULT' @@ -623,7 +622,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 'interface_driver': interface_driver, 'root_helper': 'sudo /usr/bin/neutron-rootwrap ' '/etc/neutron/rootwrap.conf', - 'ovs_use_veth': 'True', 'handle_internal_only_routers': 'True' } section = 'DEFAULT' @@ -651,7 +649,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 'DEFAULT': { 'interface_driver': interface_driver, 'periodic_interval': '10', - 'ovs_use_veth': 'False', }, 'haproxy': { 'loadbalancer_state_path': '$state_path/lbaas', @@ -664,7 +661,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): ('neutron_lbaas.drivers.haproxy.namespace_driver.' 'HaproxyNSDriver') expected['DEFAULT'].pop('periodic_interval') - expected['DEFAULT'].pop('ovs_use_veth') elif self._get_openstack_release() >= self.trusty_kilo: expected['DEFAULT']['device_driver'] = \ ('neutron_lbaas.services.loadbalancer.drivers.haproxy.'