Merge "Stop using veth pairs to connect qdhcp ns"

This commit is contained in:
Zuul 2019-07-02 09:11:01 +00:00 committed by Gerrit Code Review
commit e32c5caf97
9 changed files with 8 additions and 26 deletions

View File

@ -17,12 +17,11 @@ enable_metadata_network = True
enable_isolated_metadata = True enable_isolated_metadata = True
{% endif -%} {% endif -%}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
enable_metadata_network = True enable_metadata_network = True
enable_isolated_metadata = True enable_isolated_metadata = True
resync_interval = 30 resync_interval = 30
use_namespaces = True use_namespaces = True
dhcp_lease_time=3600 dhcp_lease_time=3600
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}

View File

@ -11,13 +11,11 @@ admin_user = {{ service_username }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -11,13 +11,11 @@ admin_user = {{ service_username }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -28,10 +28,9 @@ dhcp_domain = {{ dns_domain }}
enable_metadata_network = {{ enable_metadata_network }} enable_metadata_network = {{ enable_metadata_network }}
enable_isolated_metadata = {{ enable_isolated_metadata }} enable_isolated_metadata = {{ enable_isolated_metadata }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
resync_interval = 30 resync_interval = 30
use_namespaces = True use_namespaces = True
dhcp_lease_time=3600 dhcp_lease_time=3600
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}

View File

@ -11,13 +11,11 @@ admin_user = {{ service_username }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -12,13 +12,11 @@ admin_user = {{ service_username }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -7,13 +7,11 @@
interface_driver = openvswitch interface_driver = openvswitch
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -7,13 +7,11 @@
interface_driver = openvswitch interface_driver = openvswitch
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }} handle_internal_only_routers = {{ handle_internal_only_router }}
ovs_use_veth = False
{% if plugin == 'n1kv' %} {% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %} {% endif %}
{% if external_configuration_new -%} {% if external_configuration_new -%}
gateway_external_network_id = gateway_external_network_id =

View File

@ -562,7 +562,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'dhcp_driver': 'neutron.agent.linux.dhcp.Dnsmasq', 'dhcp_driver': 'neutron.agent.linux.dhcp.Dnsmasq',
'root_helper': 'sudo /usr/bin/neutron-rootwrap ' 'root_helper': 'sudo /usr/bin/neutron-rootwrap '
'/etc/neutron/rootwrap.conf', '/etc/neutron/rootwrap.conf',
'ovs_use_veth': 'True'
} }
section = 'DEFAULT' section = 'DEFAULT'
@ -623,7 +622,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'interface_driver': interface_driver, 'interface_driver': interface_driver,
'root_helper': 'sudo /usr/bin/neutron-rootwrap ' 'root_helper': 'sudo /usr/bin/neutron-rootwrap '
'/etc/neutron/rootwrap.conf', '/etc/neutron/rootwrap.conf',
'ovs_use_veth': 'True',
'handle_internal_only_routers': 'True' 'handle_internal_only_routers': 'True'
} }
section = 'DEFAULT' section = 'DEFAULT'
@ -651,7 +649,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'DEFAULT': { 'DEFAULT': {
'interface_driver': interface_driver, 'interface_driver': interface_driver,
'periodic_interval': '10', 'periodic_interval': '10',
'ovs_use_veth': 'False',
}, },
'haproxy': { 'haproxy': {
'loadbalancer_state_path': '$state_path/lbaas', 'loadbalancer_state_path': '$state_path/lbaas',
@ -664,7 +661,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
('neutron_lbaas.drivers.haproxy.namespace_driver.' ('neutron_lbaas.drivers.haproxy.namespace_driver.'
'HaproxyNSDriver') 'HaproxyNSDriver')
expected['DEFAULT'].pop('periodic_interval') expected['DEFAULT'].pop('periodic_interval')
expected['DEFAULT'].pop('ovs_use_veth')
elif self._get_openstack_release() >= self.trusty_kilo: elif self._get_openstack_release() >= self.trusty_kilo:
expected['DEFAULT']['device_driver'] = \ expected['DEFAULT']['device_driver'] = \
('neutron_lbaas.services.loadbalancer.drivers.haproxy.' ('neutron_lbaas.services.loadbalancer.drivers.haproxy.'