|
1 In-house patch to allow the vpnaas agent to configure the Solaris driver properties |
|
2 Currently unsuitable for upsteam contribution. |
|
3 |
|
4 --- openstack-neutron-6.1.0/manifests/agents/vpnaas.pp.orig Thu Oct 15 08:03:13 2015 |
|
5 +++ openstack-neutron-6.1.0/manifests/agents/vpnaas.pp Fri Mar 11 14:46:06 2016 |
|
6 @@ -43,6 +43,12 @@ |
|
7 # [*ipsec_status_check_interval*] |
|
8 # (optional) Status check interval. Defaults to '60'. |
|
9 # |
|
10 +# [*packet_logging*] |
|
11 +# (optional) For the Solaris driver, enable logging discarded packets. |
|
12 +# |
|
13 +# [*logger_level*] |
|
14 +# (optional) For the Solaris driver, the level at which to log discarded packets. |
|
15 +# |
|
16 class neutron::agents::vpnaas ( |
|
17 $package_ensure = present, |
|
18 $enabled = true, |
|
19 @@ -50,7 +56,9 @@ |
|
20 $vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver', |
|
21 $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', |
|
22 $external_network_bridge = undef, |
|
23 - $ipsec_status_check_interval = '60' |
|
24 + $ipsec_status_check_interval = '60', |
|
25 + $packet_logging = undef, |
|
26 + $logger_level = undef |
|
27 ) { |
|
28 |
|
29 include ::neutron::params |
|
30 @@ -66,6 +74,15 @@ |
|
31 name => $::neutron::params::openswan_package, |
|
32 } |
|
33 } |
|
34 + |
|
35 + /\.SolarisIPsecDriver$/ { |
|
36 + neutron_vpnaas_agent_config { |
|
37 + 'solaris/ipsec_status_check_interval': value => $ipsec_status_check_interval; |
|
38 + 'solaris/packet_logging': value => $packet_logging; |
|
39 + 'solaris/logger_level': value => $logger_level; |
|
40 + } |
|
41 + } |
|
42 + |
|
43 default: { |
|
44 fail("Unsupported vpn_device_driver ${vpn_device_driver}") |
|
45 } |