From 47115b0314bcb9006d674fb0c7da6ac6eb94de29 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Fri, 18 Dec 2015 11:08:38 +0000 Subject: [PATCH] Neutron VPNaaS: Set default service provider Default value needs to be set for service_provider config item in neutron_vpnaas.conf. This is to support backward compatability for using the enable_service q-vpn. It should be noted that the recommended way to use VPN is the devstack plugin. Change-Id: I0d5960c81c47a138087d480527eff2a8eef59445 Closes-bug: #1527483 --- lib/neutron-legacy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/neutron-legacy b/lib/neutron-legacy index e0c4676297..6af44e6ab8 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -115,6 +115,9 @@ export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/d # Default provider for load balancer service DEFAULT_LB_PROVIDER=LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default +# Default provider for VPN service +DEFAULT_VPN_PROVIDER=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default + # Agent binaries. Note, binary paths for other agents are set in per-service # scripts in lib/neutron_plugins/services/ AGENT_DHCP_BINARY="$NEUTRON_BIN_DIR/neutron-dhcp-agent" @@ -1092,6 +1095,7 @@ function _configure_neutron_vpn { (cd $NEUTRON_VPNAAS_DIR && exec ./tools/generate_config_file_samples.sh) if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf.sample ]; then cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf.sample $NEUTRON_CONF_DIR/neutron_vpnaas.conf + iniset $NEUTRON_CONF_DIR/neutron_vpnaas.conf service_providers service_provider $DEFAULT_VPN_PROVIDER fi neutron_vpn_install_agent_packages neutron_vpn_configure_common