From 2119a5403422bc250aa24112ae4f9236bc7c9866 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 9 Nov 2016 09:09:05 +0000 Subject: [PATCH] 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 --- projects/50_neutron/upgrade.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/50_neutron/upgrade.sh b/projects/50_neutron/upgrade.sh index e3282eaf..78c9ac22 100755 --- a/projects/50_neutron/upgrade.sh +++ b/projects/50_neutron/upgrade.sh @@ -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"}