openstack
/
neutron-vpnaas
Code Issues Proposed changes

Add vpnaas conf to Q_PLUGIN_EXTRA_CONF_FILES 

A recent change[1] that adds lbaas conf files to
Q_PLUGIN_EXTRA_CONF_FILES has broken vpnaas devstack
plugin.

[1] https://review.openstack.org/#/c/366690

Change-Id: Ice58bce3c2bd469a52299b9c830b9b588d700acf
Closes-Bug: #1624976
This commit is contained in:
rabi 2016-09-19 11:01:19 +05:30
parent 40888a9ce6
commit e9d8afa2d7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/settings
View File

@ -18,7 +18,12 @@ NEUTRON_VPNAAS_DEVICE_DRIVER=${NEUTRON_VPNAAS_DEVICE_DRIVER:-"neutron_vpnaas.ser
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
NEUTRON_VPNAAS_CONF_FILE=neutron_vpnaas.conf
NEUTRON_VPNAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_VPNAAS_CONF_FILE
Q_PLUGIN_EXTRA_CONF_PATH=$NEUTRON_CONF_DIR
Q_PLUGIN_EXTRA_CONF_FILES+=$NEUTRON_VPNAAS_CONF_FILE
declare -a Q_VPN_EXTRA_CONF_FILES