--- a/components/openstack/neutron/files/l3_agent.ini Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/neutron/files/l3_agent.ini Thu Mar 19 14:41:20 2015 -0700
@@ -13,14 +13,14 @@
# If use_namespaces is set as False then the agent can only configure one
# router.
-
# This is done by setting the specific router_id.
# router_id =
-# Each L3 agent can be associated with at most one external network. This
-# value should be set to the UUID of that external network. If empty,
-# the agent will enforce that only a single external networks exists and
-# use that external network id
+# When external_network_bridge is set, each L3 agent can be associated
+# with no more than one external network. This value should be set to the UUID
+# of that external network. To allow L3 agent support multiple external
+# networks, both the external_network_bridge and gateway_external_network_id
+# must be left empty.
# gateway_external_network_id =
# Indicates that this L3 agent should also handle routers that do not have
@@ -30,9 +30,17 @@
# handle_internal_only_routers = True
# Name of bridge used for external network traffic. This should be set to
-# empty value for the linux bridge
+# empty value for the linux bridge. when this parameter is set, each L3 agent
+# can be associated with no more than one external network.
external_network_bridge =
+# TCP Port used by Neutron metadata server
+# metadata_port = 9697
+
+# Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
+# to disable this feature.
+# send_arp_for_ha = 3
+
# seconds between re-sync routers' data if needed
# periodic_interval = 40
@@ -42,7 +50,41 @@
# enable_metadata_proxy, which is true by default, can be set to False
# if the Nova metadata server is not available
-enable_metadata_proxy = False
+enable_metadata_proxy = True
+
+# Location of Metadata Proxy UNIX domain socket
+# metadata_proxy_socket = $state_path/metadata_proxy
+
+# router_delete_namespaces, which is false by default, can be set to True if
+# namespaces can be deleted cleanly on the host running the L3 agent.
+# Do not enable this until you understand the problem with the Linux iproute
+# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and
+# you are sure that your version of iproute does not suffer from the problem.
+# If True, namespaces will be deleted when a router is destroyed.
+# router_delete_namespaces = False
+
+# The working mode for the agent. Allowed values are:
+# - legacy: this preserves the existing behavior where the L3 agent is
+# deployed on a centralized networking node to provide L3 services
+# like DNAT, and SNAT. Use this mode if you do not want to adopt DVR.
+# - dvr: this mode enables DVR functionality, and must be used for an L3
+# agent that runs on a compute host.
+# - dvr_snat: this enables centralized SNAT support in conjunction with
+# DVR. This mode must be used for an L3 agent running on a centralized
+# node (or in single-host deployments, e.g. devstack).
+# agent_mode = legacy
+
+# Location to store keepalived and all HA configurations
+# ha_confs_path = $state_path/ha_confs
+
+# VRRP authentication type AH/PASS
+# ha_vrrp_auth_type = PASS
+
+# VRRP authentication password
+# ha_vrrp_auth_password =
+
+# The advertisement interval in seconds
+# ha_vrrp_advert_int = 2
# Name of the datalink that connects to an external network. By default it's
# set to net0.