Browse Source

Merge "Revert "Stop using veth pairs to connect qdhcp ns""

changes/73/675973/1
Zuul 6 months ago
parent
commit
1ae213c4c3
9 changed files with 26 additions and 8 deletions
  1. +2
    -1
      templates/icehouse/dhcp_agent.ini
  2. +3
    -1
      templates/icehouse/l3_agent.ini
  3. +3
    -1
      templates/juno/l3_agent.ini
  4. +2
    -1
      templates/mitaka/dhcp_agent.ini
  5. +3
    -1
      templates/mitaka/l3_agent.ini
  6. +3
    -1
      templates/newton/l3_agent.ini
  7. +3
    -1
      templates/queens/l3_agent.ini
  8. +3
    -1
      templates/stein/l3_agent.ini
  9. +4
    -0
      tests/basic_deployment.py

+ 2
- 1
templates/icehouse/dhcp_agent.ini View File

@@ -17,11 +17,12 @@ 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 %}

+ 3
- 1
templates/icehouse/l3_agent.ini View File

@@ -11,11 +11,13 @@ 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 =

+ 3
- 1
templates/juno/l3_agent.ini View File

@@ -11,11 +11,13 @@ 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 =

+ 2
- 1
templates/mitaka/dhcp_agent.ini View File

@@ -28,9 +28,10 @@ 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 %}

+ 3
- 1
templates/mitaka/l3_agent.ini View File

@@ -11,11 +11,13 @@ 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 =

+ 3
- 1
templates/newton/l3_agent.ini View File

@@ -12,11 +12,13 @@ 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 =

+ 3
- 1
templates/queens/l3_agent.ini View File

@@ -7,11 +7,13 @@
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 =

+ 3
- 1
templates/stein/l3_agent.ini View File

@@ -7,11 +7,13 @@
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 =

+ 4
- 0
tests/basic_deployment.py View File

@@ -562,6 +562,7 @@ 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'

@@ -622,6 +623,7 @@ 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'
@@ -649,6 +651,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'DEFAULT': {
'interface_driver': interface_driver,
'periodic_interval': '10',
'ovs_use_veth': 'False',
},
'haproxy': {
'loadbalancer_state_path': '$state_path/lbaas',
@@ -661,6 +664,7 @@ 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.'

Loading…
Cancel
Save