--- a/components/openstack/neutron/files/l3_agent.ini Wed Jun 11 05:34:04 2014 -0700
+++ b/components/openstack/neutron/files/l3_agent.ini Fri Jun 13 09:10:23 2014 -0700
@@ -1,19 +1,20 @@
[DEFAULT]
# Show debugging output in log (sets DEBUG log level output)
-# debug = True
+# debug = False
-# L3 requires that an interface driver be set. Choose the one that best
+# L3 requires that an interface driver be set. Choose the one that best
# matches your plugin.
-
# Solaris Elastic Virtual Switch (EVS)
-interface_driver = quantum.agent.solaris.interface.SolarisVNICDriver
+interface_driver = neutron.agent.solaris.interface.SolarisVNICDriver
# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
# iproute2 package that supports namespaces).
-# use_namespaces = False
+use_namespaces = False
# 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.
+
+# This is done by setting the specific router_id.
# router_id =
# Each L3 agent can be associated with at most one external network. This
@@ -24,13 +25,13 @@
# Indicates that this L3 agent should also handle routers that do not have
# an external network gateway configured. This option should be True only
-# for a single agent in a Quantum deployment, and may be False for all agents
+# for a single agent in a Neutron deployment, and may be False for all agents
# if all routers must have an external network gateway
# handle_internal_only_routers = True
# Name of bridge used for external network traffic. This should be set to
# empty value for the linux bridge
-# external_network_bridge =
+external_network_bridge =
# seconds between re-sync routers' data if needed
# periodic_interval = 40
@@ -39,6 +40,10 @@
# starting agent
# periodic_fuzzy_delay = 5
+# 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
+
# Name of the datalink that connects to an external network. By default it's
# set to net0.
# external_network_datalink = net0