openstack/devstack
Code Issues Proposed changes

Merge "Neutron VPNaaS: Use generated configuration files if available"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 22:16:24 +00:00 committed by Gerrit Code Review
commit f3913f7b89
2 changed files with 7 additions and 3 deletions
lib
neutron-legacy
neutron_plugins/services
vpn

6
lib/neutron-legacy

@ -1086,8 +1086,10 @@ function _configure_neutron_fwaas {
} }
function _configure_neutron_vpn { function _configure_neutron_vpn {
if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf ]; then # Uses oslo config generator to generate VPNaaS sample configuration files
cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf $NEUTRON_CONF_DIR (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
fi fi
neutron_vpn_install_agent_packages neutron_vpn_install_agent_packages
neutron_vpn_configure_common neutron_vpn_configure_common

4
lib/neutron_plugins/services/vpn

@ -29,7 +29,9 @@ function neutron_vpn_configure_common {
} }
function neutron_vpn_configure_agent { function neutron_vpn_configure_agent {
cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini $Q_VPN_CONF_FILE # 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 if [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
if is_fedora; then if is_fedora; then