|
1 In-house patch to remove the router_id option from configuration of |
|
2 l3-agent. A similar patch has been already merged upstream and can be |
|
3 found here: |
|
4 |
|
5 https://review.openstack.org/#/c/340639/ |
|
6 |
|
7 --- openstack-neutron-8.0.1/manifests/agents/l3.pp.orig 2016-08-02 14:15:50.741614903 -0700 |
|
8 +++ openstack-neutron-8.0.1/manifests/agents/l3.pp 2016-08-02 14:16:08.531341208 -0700 |
|
9 @@ -26,10 +26,6 @@ |
|
10 # (optional) Driver to interface with neutron |
|
11 # Defaults to OVSInterfaceDriver |
|
12 # |
|
13 -# [*router_id*] |
|
14 -# (optional) The ID of the external router in neutron |
|
15 -# Defaults to $::os_service_default |
|
16 -# |
|
17 # [*gateway_external_network_id*] |
|
18 # (optional) The ID of the external network in neutron |
|
19 # Defaults to $::os_service_default |
|
20 @@ -125,7 +121,6 @@ class neutron::agents::l3 ( |
|
21 $manage_service = true, |
|
22 $debug = false, |
|
23 $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', |
|
24 - $router_id = $::os_service_default, |
|
25 $gateway_external_network_id = $::os_service_default, |
|
26 $handle_internal_only_routers = $::os_service_default, |
|
27 $metadata_port = $::os_service_default, |
|
28 @@ -178,7 +173,6 @@ class neutron::agents::l3 ( |
|
29 'DEFAULT/debug': value => $debug; |
|
30 'DEFAULT/external_network_bridge': value => $external_network_bridge; |
|
31 'DEFAULT/interface_driver': value => $interface_driver; |
|
32 - 'DEFAULT/router_id': value => $router_id; |
|
33 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id; |
|
34 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers; |
|
35 'DEFAULT/metadata_port': value => $metadata_port; |