--- a/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
In-house patch for Solaris L3 agent driver configuration variables.
This patch is not currently suitable for upstream contribution.
---- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig Fri Mar 11 15:26:19 2016
-+++ openstack-neutron-6.1.0/manifests/agents/l3.pp Fri Mar 11 15:27:59 2016
-@@ -99,6 +99,14 @@
+--- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig 2016-04-21 08:23:04.952418874 -0700
++++ openstack-neutron-6.1.0/manifests/agents/l3.pp 2016-04-21 08:23:19.798506700 -0700
+@@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: neutron::agents::l3
+ #
+ # Installs and configures the Neutron L3 service
+@@ -99,6 +103,14 @@
# 'dvr_snat': enable DVR with centralized SNAT support (DVR for single-host, for testing only)
# Defaults to 'legacy'
#
@@ -18,7 +26,7 @@
# [*allow_automatic_l3agent_failover*]
# DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead.
#
-@@ -161,6 +169,9 @@
+@@ -161,6 +173,9 @@
'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy;
'DEFAULT/router_delete_namespaces': value => $router_delete_namespaces;
'DEFAULT/agent_mode': value => $agent_mode;