Browse Source

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

changes/73/675973/1
Zuul 1 month ago
parent
commit
1ae213c4c3

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

@@ -17,11 +17,12 @@ enable_metadata_network = True
17 17
 enable_isolated_metadata = True
18 18
 {% endif -%}
19 19
 
20
-ovs_use_veth = False
21 20
 {% if plugin == 'n1kv' %}
22 21
 enable_metadata_network = True
23 22
 enable_isolated_metadata = True
24 23
 resync_interval = 30
25 24
 use_namespaces = True
26 25
 dhcp_lease_time=3600
26
+{% else %}
27
+ovs_use_veth = True
27 28
 {% endif %}

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

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

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

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

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

@@ -28,9 +28,10 @@ dhcp_domain = {{ dns_domain }}
28 28
 enable_metadata_network = {{ enable_metadata_network }}
29 29
 enable_isolated_metadata = {{ enable_isolated_metadata }}
30 30
 
31
-ovs_use_veth = False
32 31
 {% if plugin == 'n1kv' %}
33 32
 resync_interval = 30
34 33
 use_namespaces = True
35 34
 dhcp_lease_time=3600
35
+{% else %}
36
+ovs_use_veth = True
36 37
 {% endif %}

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

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

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

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

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

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

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

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

+ 4
- 0
tests/basic_deployment.py View File

@@ -562,6 +562,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
562 562
             'dhcp_driver': 'neutron.agent.linux.dhcp.Dnsmasq',
563 563
             'root_helper': 'sudo /usr/bin/neutron-rootwrap '
564 564
                            '/etc/neutron/rootwrap.conf',
565
+            'ovs_use_veth': 'True'
565 566
         }
566 567
         section = 'DEFAULT'
567 568
 
@@ -622,6 +623,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
622 623
             'interface_driver': interface_driver,
623 624
             'root_helper': 'sudo /usr/bin/neutron-rootwrap '
624 625
                            '/etc/neutron/rootwrap.conf',
626
+            'ovs_use_veth': 'True',
625 627
             'handle_internal_only_routers': 'True'
626 628
         }
627 629
         section = 'DEFAULT'
@@ -649,6 +651,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
649 651
             'DEFAULT': {
650 652
                 'interface_driver': interface_driver,
651 653
                 'periodic_interval': '10',
654
+                'ovs_use_veth': 'False',
652 655
             },
653 656
             'haproxy': {
654 657
                 'loadbalancer_state_path': '$state_path/lbaas',
@@ -661,6 +664,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
661 664
                 ('neutron_lbaas.drivers.haproxy.namespace_driver.'
662 665
                  'HaproxyNSDriver')
663 666
             expected['DEFAULT'].pop('periodic_interval')
667
+            expected['DEFAULT'].pop('ovs_use_veth')
664 668
         elif self._get_openstack_release() >= self.trusty_kilo:
665 669
             expected['DEFAULT']['device_driver'] = \
666 670
                 ('neutron_lbaas.services.loadbalancer.drivers.haproxy.'

Loading…
Cancel
Save