|
1 In-house patch to include the (public) Solaris VPNaaS options in the |
|
2 corresponding configuration files. This patch potentially can be sent |
|
3 upstream. |
|
4 |
|
5 --- neutron-vpnaas-8.0.0/neutron_vpnaas/opts.py.~1~ 2016-04-07 00:44:22.000000000 -0700 |
|
6 +++ neutron-vpnaas-8.0.0/neutron_vpnaas/opts.py 2016-06-19 23:06:51.215920180 -0700 |
|
7 @@ -15,6 +15,7 @@ import neutron.services.provider_configu |
|
8 import neutron_vpnaas.services.vpn.agent |
|
9 import neutron_vpnaas.services.vpn.device_drivers.ipsec |
|
10 import neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec |
|
11 +import neutron_vpnaas.services.vpn.device_drivers.solaris_ipsec |
|
12 |
|
13 |
|
14 def list_agent_opts(): |
|
15 @@ -27,7 +28,9 @@ def list_agent_opts(): |
|
16 neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec. |
|
17 strongswan_opts), |
|
18 ('pluto', |
|
19 - neutron_vpnaas.services.vpn.device_drivers.ipsec.pluto_opts) |
|
20 + neutron_vpnaas.services.vpn.device_drivers.ipsec.pluto_opts), |
|
21 + ('solaris', |
|
22 + neutron_vpnaas.services.vpn.device_drivers.solaris_ipsec.solaris_opts) |
|
23 ] |
|
24 |
|
25 |
|
26 --- neutron-vpnaas-8.0.0/neutron_vpnaas/services/vpn/agent.py.~1~ 2016-04-07 00:44:22.000000000 -0700 |
|
27 +++ neutron-vpnaas-8.0.0/neutron_vpnaas/services/vpn/agent.py 2016-06-19 23:14:24.505511035 -0700 |
|
28 @@ -37,7 +37,9 @@ vpn_agent_opts = [ |
|
29 'neutron_vpnaas.services.vpn.device_drivers.' |
|
30 'fedora_strongswan_ipsec.FedoraStrongSwanDriver, ' |
|
31 'neutron_vpnaas.services.vpn.device_drivers.' |
|
32 - 'libreswan_ipsec.LibreSwanDriver'], |
|
33 + 'libreswan_ipsec.LibreSwanDriver, ' |
|
34 + 'neutron_vpnaas.services.vpn.device_drivers.' |
|
35 + 'solaris_ipsec.SolarisIPsecDriver'], |
|
36 help=_("The vpn device drivers Neutron will use")), |
|
37 ] |
|
38 cfg.CONF.register_opts(vpn_agent_opts, 'vpnagent') |