openstack
/
grenade
Code Issues Proposed changes

neutron: support linuxbridge 

Before assuming openvswitch agent, first check if Q_AGENT is set to
linuxbridge, in which case, use linuxbridge agent.

Change-Id: Iab88e630f98e73a2d5676229807487cb8806077d
This commit is contained in:
Ihar Hrachyshka 2016-11-09 09:09:05 +00:00
parent ed53369a6d
commit 2119a54034
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/50_neutron/upgrade.sh
View File

@ -120,7 +120,12 @@ Q_DHCP_CONF_FILE=${Q_DHCP_CONF_FILE:-"$NEUTRON_CONF_DIR/dhcp_agent.ini"}
AGENT_META_BINARY=${AGENT_META_BINARY:-"$NEUTRON_BIN_DIR/neutron-metadata-agent"}
Q_META_CONF_FILE=${Q_META_CONF_FILE:-"$NEUTRON_CONF_DIR/metadata_agent.ini"}
AGENT_BINARY=${AGENT_BINARY:-"$NEUTRON_BIN_DIR/neutron-openvswitch-agent"}
if [ "$Q_AGENT" == "linuxbridge" ]; then
AGENT_BINARY=${AGENT_BINARY:-"$NEUTRON_BIN_DIR/neutron-linuxbridge-agent"}
else
# fall back to openvswitch as the default
AGENT_BINARY=${AGENT_BINARY:-"$NEUTRON_BIN_DIR/neutron-openvswitch-agent"}
fi
AGENT_LBAAS_BINARY=${AGENT_LBAAS_BINARY:-"$NEUTRON_BIN_DIR/neutron-lbaas-agent"}
LBAAS_AGENT_CONF_FILENAME=${LBAAS_AGENT_CONF_FILENAME:-"/etc/neutron/services/loadbalancer/haproxy/lbaas_agent.ini"}