openstack
/
neutron-vpnaas
Code Issues Proposed changes

devstack: Add neutron server config explicitly 

Use neutron_server_config_add instead of Q_PLUGIN_EXTRA_CONF_FILES.

Closes-Bug: #1643597
Partial-Bug: #1599936
Depends-On: I90112823ef96ae2fba97d7b09b00bec8cb816d8d
Change-Id: If0bf812aac9f32011306face743218fe5f8b2aa8
This commit is contained in:
YAMAMOTO Takashi 2016-07-15 10:59:38 +09:00
parent cdd940f11d
commit fb30a7a64f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -24,6 +24,7 @@ function neutron_agent_vpnaas_install_agent_packages {
function neutron_vpnaas_configure_common {
cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf.sample $NEUTRON_VPNAAS_CONF
neutron_server_config_add $NEUTRON_VPNAAS_CONF
_neutron_service_plugin_class_add $VPN_PLUGIN
_neutron_deploy_rootwrap_filters $NEUTRON_VPNAAS_DIR
inicomment $NEUTRON_VPNAAS_CONF service_providers service_provider

3
devstack/settings
View File

@ -22,7 +22,4 @@ Q_VPN_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
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