openstack
/
neutron-vpnaas
Code Issues Proposed changes

Set path for neutron conf dir in devstack if missing 

The variable NEUTRON_CONF_DIR is no longer available to the
script for functional setup. This defaults it to the correct
location if it's not already set.

Closes-Bug: #1579946
Change-Id: I060aea1de70d7939a8ea68771702f74a00d88fe9
This commit is contained in:
Kevin Benton 2016-05-06 20:03:11 -07:00
parent 36f16b14ca
commit 3086f0247c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/settings
View File

@ -15,6 +15,7 @@ IPSEC_PACKAGE=${IPSEC_PACKAGE:-"openswan"}
NEUTRON_VPNAAS_DEVICE_DRIVER=${NEUTRON_VPNAAS_DEVICE_DRIVER:-"neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver"}
# Config files
NEUTRON_CONF_DIR=${NEUTRON_CONF_DIR:-"/etc/neutron"}
NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas
Q_VPN_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
NEUTRON_VPNAAS_CONF=$NEUTRON_CONF_DIR/neutron_vpnaas.conf