devstack: fix OVS compilation hook

Code Issues Proposed changes

Follow changes made in how Neutron devstack handles
compiling a fresh OVS (see Ia7ad1658b95d7404384c7cae833008a57e3e5af1).
The benefit is that our devstack code is simplified.
Change-Id: I3abc2ac4ce2d4710f998e7749d1f5df4303533e2

This commit is contained in:

Thomas Morin

2016年04月29日 16:30:52 -05:00

committed by Thomas Morin

parent 515a76552c

commit c31b679bd6

2 changed files with 2 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/devstack-gate-bagpipe-rc

View File

@@ -15,5 +15,6 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"BAGPIPE_DATAPLANE_DRIVER_IPVPN=mpls_ovs_data

export DEVSTACK_LOCAL_CONFIG+=$'\n'"VERBOSE=False"

# compiling a fresh OVS is done in gate_hook.sh

export COMPILE_OVS=True

export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron"

export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_BUILD_OVS_FROM_GIT=True"

19
devstack/gate_hook.sh

View File

@@ -1,25 +1,6 @@

#!/bin/sh

GATE_DEST=$BASE/new

DEVSTACK_PATH=$GATE_DEST/devstack

NEUTRON_PATH=$GATE_DEST/neutron

if [[ "$COMPILE_OVS" == "True" ]]; then

source $DEVSTACK_PATH/functions

source $NEUTRON_PATH/devstack/lib/ovs

# The OVS_BRANCH variable is used by git checkout.

OVS_BRANCH=branch-2.4

echo "Compiling OVS $OVS_BRANCH..."

for package in openvswitch openvswitch-switch openvswitch-common; do

if is_package_installed $package; then

uninstall_package $package

fi

done

compile_ovs True /usr

echo "Starting new OVS..."

start_new_ovs

fi

sudo modprobe bridge