From 242dd8507d279df78f179fafa3bece49b1fd4f29 Mon Sep 17 00:00:00 2001 From: Doug Wiegley Date: Tue, 18 Aug 2015 01:59:04 +0000 Subject: [PATCH] Revert "Remove default service provider from conf file" Now that https://review.openstack.org/#/c/213750/ has merged, which addresses the root issue, this symptom fixer, which has quite a few side effects, can be reverted until it's addressed sanely. This reverts commit f9d5c0505752b5720beab589f9d76573740a695e. Change-Id: Ie013b452457b460de798c5d5d06133784d2f321f --- etc/neutron_vpnaas.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/neutron_vpnaas.conf b/etc/neutron_vpnaas.conf index 61a892a14..b3b323db8 100644 --- a/etc/neutron_vpnaas.conf +++ b/etc/neutron_vpnaas.conf @@ -5,8 +5,7 @@ # List of allowed service types includes VPN # Combination of and must be unique; must also be unique # This is multiline option -# Reference implementation -# service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default +service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default # Uncomment the following line (and comment out the OpenSwan VPN line) to enable Cisco's VPN driver. # service_provider=VPN:cisco:neutron_vpnaas.services.vpn.service_drivers.cisco_ipsec.CiscoCsrIPsecVPNDriver:default # Uncomment the following line (and comment out the OpenSwan VPN line) to enable Brocade Vyatta's VPN driver.