523f488036
I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695
57 lines
1.9 KiB
Bash
57 lines
1.9 KiB
Bash
#!/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 {
|
|
cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini $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
|