Merge "Remove default service provider from conf file"

This commit is contained in:
Jenkins 2015-08-15 21:44:41 +00:00 committed by Gerrit Code Review
commit af903a2fad

View File

@ -5,7 +5,8 @@
# List of allowed service types includes VPN # List of allowed service types includes VPN
# Combination of <service type> and <name> must be unique; <driver> must also be unique # Combination of <service type> and <name> must be unique; <driver> must also be unique
# This is multiline option # This is multiline option
service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default # Reference implementation
# 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. # 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 # 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. # Uncomment the following line (and comment out the OpenSwan VPN line) to enable Brocade Vyatta's VPN driver.