openstack
/
neutron-vpnaas
Code Issues Proposed changes

[DevStack] Fix StrongSwan setup on Fedora 

Use FedoraStrongSwanDriver instead of StrongSwanDriver on Fedora.
This also make setting the default_config_area option unnecessary
as FedoraStrongSwanDriver overrides it itself.

Change-Id: I2fa2f41dcbebe456c46980cfd11b1221288fed66
This commit is contained in:
Elena Ezhova 2015-08-21 19:31:12 +03:00
parent af903a2fad
commit 5503655111
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -33,9 +33,10 @@ function neutron_vpnaas_configure_agent {
local conf_file=${1:-$Q_VPN_CONF_FILE}
cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini $conf_file
if [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
iniset_multiline $conf_file vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
if is_fedora; then
iniset $conf_file strongswan default_config_area /usr/share/strongswan/templates/config/strongswan.d
iniset_multiline $conf_file vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.fedora_strongswan_ipsec.FedoraStrongSwanDriver
else
iniset_multiline $conf_file vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
fi
else
iniset_multiline $conf_file vpnagent vpn_device_driver $NEUTRON_VPNAAS_DEVICE_DRIVER