cdecf0e122
neutron_vpnaas_generate_config_files() in devstack/plugin.sh uses sudo unnecessarily. It creates pyc files with root owner and when we run stack.sh again stack.sh will fail. Change-Id: I611ded0a60383f183f053c7a5ff5ccb3f0639e75
86 lines
3.0 KiB
Bash
86 lines
3.0 KiB
Bash
# plugin.sh - DevStack plugin.sh dispatch script template
|
|
|
|
VPNAAS_XTRACE=$(set +o | grep xtrace)
|
|
set -o xtrace
|
|
|
|
# Source L3 agent extension management
|
|
LIBDIR=$DEST/neutron-vpnaas/devstack/lib
|
|
source $LIBDIR/l3_agent
|
|
|
|
NEUTRON_L3_CONF=${NEUTRON_L3_CONF:-$Q_L3_CONF_FILE}
|
|
|
|
function neutron_vpnaas_install {
|
|
setup_develop $NEUTRON_VPNAAS_DIR
|
|
if is_service_enabled q-l3 neutron-l3; then
|
|
neutron_agent_vpnaas_install_agent_packages
|
|
fi
|
|
}
|
|
|
|
function neutron_agent_vpnaas_install_agent_packages {
|
|
install_package $IPSEC_PACKAGE
|
|
if is_ubuntu && [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
|
|
install_package apparmor
|
|
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_vpnaas_configure_common {
|
|
cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf.sample $NEUTRON_VPNAAS_CONF
|
|
neutron_server_config_add $NEUTRON_VPNAAS_CONF
|
|
neutron_service_plugin_class_add $VPN_PLUGIN
|
|
neutron_deploy_rootwrap_filters $NEUTRON_VPNAAS_DIR
|
|
inicomment $NEUTRON_VPNAAS_CONF service_providers service_provider
|
|
iniadd $NEUTRON_VPNAAS_CONF service_providers service_provider $NEUTRON_VPNAAS_SERVICE_PROVIDER
|
|
}
|
|
|
|
function neutron_vpnaas_configure_agent {
|
|
plugin_agent_add_l3_agent_extension vpnaas
|
|
configure_l3_agent
|
|
if [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
|
|
iniset_multiline $NEUTRON_L3_CONF vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
|
|
elif [[ "$IPSEC_PACKAGE" == "libreswan" ]]; then
|
|
iniset_multiline $NEUTRON_L3_CONF vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver
|
|
else
|
|
iniset_multiline $NEUTRON_L3_CONF vpnagent vpn_device_driver $NEUTRON_VPNAAS_DEVICE_DRIVER
|
|
fi
|
|
}
|
|
|
|
function neutron_vpnaas_configure_db {
|
|
$NEUTRON_BIN_DIR/neutron-db-manage --subproject neutron-vpnaas --config-file $NEUTRON_CONF upgrade head
|
|
}
|
|
|
|
function neutron_vpnaas_generate_config_files {
|
|
# Uses oslo config generator to generate VPNaaS sample configuration files
|
|
(cd $NEUTRON_VPNAAS_DIR && exec ./tools/generate_config_file_samples.sh)
|
|
}
|
|
|
|
# Main plugin processing
|
|
|
|
# NOP for pre-install step
|
|
|
|
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
|
echo_summary "Installing neutron-vpnaas"
|
|
neutron_vpnaas_install
|
|
|
|
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
|
neutron_vpnaas_generate_config_files
|
|
neutron_vpnaas_configure_common
|
|
if is_service_enabled q-svc neutron-api; then
|
|
echo_summary "Configuring neutron-vpnaas on controller"
|
|
neutron_vpnaas_configure_db
|
|
fi
|
|
if is_service_enabled q-l3 neutron-l3; then
|
|
echo_summary "Configuring neutron-vpnaas agent"
|
|
neutron_vpnaas_configure_agent
|
|
fi
|
|
|
|
# NOP for clean step
|
|
|
|
fi
|
|
|
|
$VPNAAS_XTRACE
|