x/packstack
Code Issues Proposed changes

Merge "Use the Libreswan driver for VPNaaS"

Browse Source
This commit is contained in:
Jenkins
2016-02-17 10:45:54 +00:00
committed by Gerrit Code Review
parent 4ea165cafd e0f823d8af
commit c6f16bbcf6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/puppet/templates/neutron_vpnaas.pp
View File

@@ -1,6 +1,6 @@
class { '::neutron::agents::vpnaas':
enabled => true,
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver',
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
}
# FIXME: this is a workaround until
@@ -9,7 +9,7 @@ class { '::neutron::agents::vpnaas':
file_line { 'vpnaas_service_provider':
path => '/etc/neutron/neutron_vpnaas.conf',
match => '^service_provider +=.*',
line => 'service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default',
line => 'service_provider = VPN:libreswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default',
require => Class['::neutron::agents::vpnaas'],
notify => Service['neutron-server'],
}