In-house patch to allow the vpnaas agent to configure the Solaris driver properties
Currently unsuitable for upsteam contribution.
--- openstack-neutron-6.1.0/manifests/agents/vpnaas.pp.orig 2016-04-21 08:22:00.590665221 -0700
+++ openstack-neutron-6.1.0/manifests/agents/vpnaas.pp 2016-04-21 08:22:13.759565285 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
#
# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
#
@@ -45,6 +49,12 @@
# [*external_network_bridge*]
# (optional) Deprecated. Defaults to $::os_service_default
#
+# [*packet_logging*]
+# (optional) For the Solaris driver, enable logging discarded packets.
+#
+# [*logger_level*]
+# (optional) For the Solaris driver, the level at which to log discarded packets.
+#
class neutron::agents::vpnaas (
$package_ensure = present,
$enabled = true,
@@ -52,7 +62,9 @@ class neutron::agents::vpnaas (
$vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$external_network_bridge = $::os_service_default,
- $ipsec_status_check_interval = $::os_service_default
+ $ipsec_status_check_interval = $::os_service_default,
+ $packet_logging = undef,
+ $logger_level = undef
) {
include ::neutron::params
@@ -79,6 +91,15 @@ class neutron::agents::vpnaas (
}
}
}
+
+ /\.SolarisIPsecDriver$/ {
+ neutron_vpnaas_agent_config {
+ 'solaris/ipsec_status_check_interval': value => $ipsec_status_check_interval;
+ 'solaris/packet_logging': value => $packet_logging;
+ 'solaris/logger_level': value => $logger_level;
+ }
+ }
+
default: {
fail("Unsupported vpn_device_driver ${vpn_device_driver}")
}