openstack/devstack
Code Issues Proposed changes

Merge "Prevent spawning two VPN agents"

Browse Source
This commit is contained in:
Jenkins 2015-08-18 02:59:42 +00:00 committed by Gerrit Code Review
commit 5384a94027
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron-legacy
View File

@ -730,7 +730,9 @@ function start_neutron_l2_agent {
function start_neutron_other_agents { function start_neutron_other_agents {
run_process q-dhcp "python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE" run_process q-dhcp "python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE"
if is_service_enabled q-vpn; then if is_service_enabled neutron-vpnaas; then
: # Started by plugin
elif is_service_enabled q-vpn; then
run_process q-vpn "$AGENT_VPN_BINARY $(determine_config_files neutron-vpn-agent)" run_process q-vpn "$AGENT_VPN_BINARY $(determine_config_files neutron-vpn-agent)"
else else
run_process q-l3 "python $AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)" run_process q-l3 "python $AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)"