commit 5cd250f11e11aff809c207b0a77bc8e7ba5b6c36
author Mark McClain <mmcclain@yahoo-inc.com> Wed Apr 09 16:42:31 2014 -0400
committer Mark McClain <mmcclain@yahoo-inc.com> Wed Apr 09 16:42:54 2014 -0400
tree 05a9ecfa6c4bb23756d714b6aa446fb3a9837420
parent 91a7ee7a0c09b3d08ec06a6ea30432f08302a754

Revert "Devstack support for Neutron VPNaaS"

This reverts commit 8450a92a4d0299fff89717e665ce31d54731d3f0.

Change-Id: I6dd0f44a1a57735de292bc4ed4eaa929dc308297

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index f4a7f38..546b17a 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -495,7 +495,7 @@
         L3_CONF_FILES="$L3_CONF_FILES --config-file $Q_FWAAS_CONF_FILE"
     fi
     if is_service_enabled q-vpn; then
-        screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES"
+        screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $L3_CONF_FILES"
     else
         screen_it q-l3 "cd $NEUTRON_DIR && python $AGENT_L3_BINARY $L3_CONF_FILES"
     fi
@@ -658,7 +658,6 @@
 }
 
 function _configure_neutron_l3_agent {
-    local cfg_file
     Q_L3_ENABLED=True
     # for l3-agent, only use per tenant router if we have namespaces
     Q_L3_ROUTER_PER_TENANT=$Q_USE_NAMESPACE
@@ -670,15 +669,6 @@
         Q_FWAAS_CONF_FILE=$NEUTRON_CONF_DIR/fwaas_driver.ini
     fi
 
-    if is_service_enabled q-vpn; then
-        Q_VPN_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
-        cp $NEUTRON_DIR/etc/vpn_agent.ini $Q_VPN_CONF_FILE
-        VPN_CONF_FILES="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE --config-file=$Q_VPN_CONF_FILE"
-        for cfg_file in ${Q_VPN_EXTRA_CONF_FILES[@]}; do
-            VPN_CONF_FILES+=" --config-file $cfg_file"
-        done
-    fi
-
     cp $NEUTRON_DIR/etc/l3_agent.ini $Q_L3_CONF_FILE
 
     iniset $Q_L3_CONF_FILE DEFAULT verbose True