GitList

Browse code

Update stack.sh for Quantum linuxbridge plugin changes.

With support for multiple physical networks being added to the Quantum
linuxbridge plugin via https://review.openstack.org/#/c/10938/, the
configuration of physical interfaces for the agent has changed. The
physical_interface_mappings variable, a list of mappings between
physical network names and physical interfaces, replaces the
physical_interface variable.

Also, all remnants of the V1 quantum API have been removed, so the
target_v2_api variable no longer needs to be set.

Change-Id: I5f9be772f71b5ce3fd92eb258e0131705d341647

Bob Kukura authored on 2012/08/13 15:29:54
Showing 1 changed files

stack.sh

History View file @ 8227a77

@@ -1133,7 +1133,6 @@ if is_service_enabled quantum; then
                              sudo sed -i -e "s/.*enable_tunneling = .*$/enable_tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE
                          fi
                     -    iniset /$Q_PLUGIN_CONF_FILE AGENT target_v2_api True
                          Q_CONF_FILE=/etc/quantum/quantum.conf
                          cp $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE
                      fi
@@ -1184,7 +1183,7 @@ if is_service_enabled q-agt; then
                             # Start up the quantum <-> linuxbridge agent
                             # set the default network interface
                             QUANTUM_LB_PRIVATE_INTERFACE=${QUANTUM_LB_PRIVATE_INTERFACE:-$GUEST_INTERFACE_DEFAULT}
                     -       sudo sed -i -e "s/^physical_interface = .*$/physical_interface = $QUANTUM_LB_PRIVATE_INTERFACE/g" /$Q_PLUGIN_CONF_FILE
                     +       iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE physical_interface_mappings default:$QUANTUM_LB_PRIVATE_INTERFACE
                             AGENT_BINARY="$QUANTUM_DIR/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py"
                          fi
                      fi