diff --git a/devstack/devstack-gate-bagpipe-rc b/devstack/devstack-gate-bagpipe-rc index d7192a89..2eaaced3 100644 --- a/devstack/devstack-gate-bagpipe-rc +++ b/devstack/devstack-gate-bagpipe-rc @@ -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" diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh index 5f5c1dfe..eff2339f 100644 --- a/devstack/gate_hook.sh +++ b/devstack/gate_hook.sh @@ -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

AltStyle によって変換されたページ (->オリジナル) /