diff --git a/devstack/settings b/devstack/settings
index fe0168ab8..e1d643634 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -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