Remove vpnaas code from devstack
This service is now configured by devstack plugin in master.
Change-Id: Ie5fc0d2a45c1b564f98c69ec9ea6fbdeeb465d32
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index f0592e2..0d61416 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -108,7 +108,6 @@
NEUTRON_DIR=$DEST/neutron
NEUTRON_FWAAS_DIR=$DEST/neutron-fwaas
NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas
-NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas
NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}
# Support entry points installation of console scripts
@@ -125,9 +124,6 @@
# 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"
@@ -139,7 +135,6 @@
Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
Q_L3_CONF_FILE=$NEUTRON_CONF_DIR/l3_agent.ini
Q_FWAAS_CONF_FILE=$NEUTRON_CONF_DIR/fwaas_driver.ini
-Q_VPN_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
Q_META_CONF_FILE=$NEUTRON_CONF_DIR/metadata_agent.ini
# Default name for Neutron database
@@ -231,10 +226,6 @@
# See _configure_neutron_common() for details about setting it up
declare -a Q_PLUGIN_EXTRA_CONF_FILES
-# List of (optional) config files for VPN device drivers to use with
-# the neutron-q-vpn agent
-declare -a Q_VPN_EXTRA_CONF_FILES
-
Q_RR_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
if [[ "$Q_USE_ROOTWRAP" == "False" ]]; then
@@ -359,11 +350,6 @@
# Hardcoding for 1 service plugin for now
source $TOP_DIR/lib/neutron_plugins/services/metering
-# VPN service plugin functions
-# -------------------------------------------
-# Hardcoding for 1 service plugin for now
-source $TOP_DIR/lib/neutron_plugins/services/vpn
-
# Firewall Service Plugin functions
# ---------------------------------
source $TOP_DIR/lib/neutron_plugins/services/firewall
@@ -392,19 +378,6 @@
echo "$opts"
}
-function _determine_config_vpn {
- local cfg_file
- local opts="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE --config-file=$Q_VPN_CONF_FILE"
- if is_service_enabled q-fwaas; then
- opts+=" --config-file $Q_FWAAS_CONF_FILE"
- fi
- for cfg_file in ${Q_VPN_EXTRA_CONF_FILES[@]}; do
- opts+=" --config-file $cfg_file"
- done
- echo "$opts"
-
-}
-
function _determine_config_l3 {
local opts="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE"
if is_service_enabled q-fwaas; then
@@ -419,7 +392,6 @@
local opts=""
case "$1" in
"neutron-server") opts="$(_determine_config_server)" ;;
- "neutron-vpn-agent") opts="$(_determine_config_vpn)" ;;
"neutron-l3-agent") opts="$(_determine_config_l3)" ;;
esac
if [ -z "$opts" ] ; then
@@ -449,10 +421,6 @@
if is_service_enabled q-metering; then
_configure_neutron_metering
fi
- if is_service_enabled q-vpn; then
- deprecated "Configuring q-vpn through devstack is deprecated"
- _configure_neutron_vpn
- fi
if is_service_enabled q-fwaas; then
deprecated "Configuring q-fwaas through devstack is deprecated"
_configure_neutron_fwaas
@@ -661,10 +629,6 @@
git_clone $NEUTRON_LBAAS_REPO $NEUTRON_LBAAS_DIR $NEUTRON_LBAAS_BRANCH
setup_develop $NEUTRON_LBAAS_DIR
fi
- if is_service_enabled q-vpn; then
- git_clone $NEUTRON_VPNAAS_REPO $NEUTRON_VPNAAS_DIR $NEUTRON_VPNAAS_BRANCH
- setup_develop $NEUTRON_VPNAAS_DIR
- fi
if [ "$VIRT_DRIVER" == 'xenserver' ]; then
local dom0_ip
@@ -763,8 +727,6 @@
if is_service_enabled neutron-vpnaas; then
: # Started by plugin
- elif is_service_enabled q-vpn; then
- run_process q-vpn "$AGENT_VPN_BINARY $(determine_config_files neutron-vpn-agent)"
else
run_process q-l3 "$AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)"
fi
@@ -815,9 +777,6 @@
if is_service_enabled q-fwaas; then
neutron_fwaas_stop
fi
- if is_service_enabled q-vpn; then
- neutron_vpn_stop
- fi
if is_service_enabled q-metering; then
neutron_metering_stop
fi
@@ -1072,10 +1031,6 @@
function _configure_neutron_l3_agent {
Q_L3_ENABLED=True
- if is_service_enabled q-vpn; then
- neutron_vpn_configure_agent
- fi
-
cp $NEUTRON_DIR/etc/l3_agent.ini.sample $Q_L3_CONF_FILE
iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
@@ -1135,17 +1090,6 @@
neutron_fwaas_configure_driver
}
-function _configure_neutron_vpn {
- # Uses oslo config generator to generate VPNaaS sample configuration files
- (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
-}
-
function _configure_dvr {
iniset $NEUTRON_CONF DEFAULT router_distributed True
iniset $Q_L3_CONF_FILE DEFAULT agent_mode $Q_DVR_MODE
diff --git a/lib/neutron_plugins/services/vpn b/lib/neutron_plugins/services/vpn
deleted file mode 100644
index e790913..0000000
--- a/lib/neutron_plugins/services/vpn
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# Neutron VPN plugin
-# ---------------------------
-
-# Save trace setting
-_XTRACE_NEUTRON_VPN=$(set +o | grep xtrace)
-set +o xtrace
-
-
-AGENT_VPN_BINARY="$NEUTRON_BIN_DIR/neutron-vpn-agent"
-VPN_PLUGIN=${VPN_PLUGIN:-"neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin"}
-IPSEC_PACKAGE=${IPSEC_PACKAGE:-"openswan"}
-
-function neutron_vpn_install_agent_packages {
- install_package $IPSEC_PACKAGE
- if is_ubuntu && [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
- sudo ln -sf /etc/apparmor.d/usr.lib.ipsec.charon /etc/apparmor.d/disable/
- sudo ln -sf /etc/apparmor.d/usr.lib.ipsec.stroke /etc/apparmor.d/disable/
- # NOTE: Due to https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1387220
- # one must use 'sudo start apparmor ACTION=reload' for Ubuntu 14.10
- restart_service apparmor
- fi
-}
-
-function neutron_vpn_configure_common {
- _neutron_service_plugin_class_add $VPN_PLUGIN
- _neutron_deploy_rootwrap_filters $NEUTRON_VPNAAS_DIR
-}
-
-function neutron_vpn_configure_agent {
- # Uses oslo config generator to generate LBaaS sample configuration files
- (cd $NEUTRON_VPNAAS_DIR && exec ./tools/generate_config_file_samples.sh)
- cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini.sample $Q_VPN_CONF_FILE
- if [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
- iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
- if is_fedora; then
- iniset $Q_VPN_CONF_FILE strongswan default_config_area /usr/share/strongswan/templates/config/strongswan.d
- fi
- else
- iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
- fi
-}
-
-function neutron_vpn_stop {
- local ipsec_data_dir=$DATA_DIR/neutron/ipsec
- local pids
- if [ -d $ipsec_data_dir ]; then
- pids=$(find $ipsec_data_dir -name 'pluto.pid' -exec cat {} \;)
- fi
- if [ -n "$pids" ]; then
- sudo kill $pids
- fi
- stop_process q-vpn
-}
-
-# Restore xtrace
-$_XTRACE_NEUTRON_VPN
diff --git a/stackrc b/stackrc
index 8858788..44aa79f 100644
--- a/stackrc
+++ b/stackrc
@@ -248,10 +248,6 @@
NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}
NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master}
-# neutron vpnaas service
-NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}
-NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master}
-
# compute service
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
NOVA_BRANCH=${NOVA_BRANCH:-master}