devstack job: enable bagpipe-bgp in bagpipe jobs

Code Issues Proposed changes

Change jenkins job rc file to enable bagpipe-bgp service
and configure it with the OVS MPLS dataplane.
This will automatically enable the bagpipe_bgpvpn OVS agent
extension.
It will also compile and install a recent OVS in the gate
(reusing neutron devstack scripts for this purpose).
Fix xtrace restoration.
Change-Id: Idb4fdad0da7bed5eda0c302bc79c5f05d50b44d7

This commit is contained in:

Thomas Morin

2016年03月24日 18:10:14 +01:00

parent 982677a71d

commit 2716c78811

3 changed files with 38 additions and 6 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

9
devstack/devstack-gate-bagpipe-rc

View File

@@ -4,9 +4,16 @@

# In the future we will run tempest tests as well.

export DEVSTACK_GATE_TEMPEST=0

export OVERRIDE_ENABLED_SERVICES=q-svc,q-agt,q-dhcp,q-l3,key,mysql,rabbit

export OVERRIDE_ENABLED_SERVICES=q-svc,q-agt,q-dhcp,q-l3,key,mysql,rabbit,b-bgp

export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORKING_BGPVPN_DRIVER=BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default"

export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-bagpipe https://git.openstack.org/openstack/networking-bagpipe"

export DEVSTACK_LOCAL_CONFIG+=$'\n'"BAGPIPE_DATAPLANE_DRIVER_IPVPN=mpls_ovs_dataplane.MPLSOVSDataplaneDriver"

# https://bugs.launchpad.net/devstack/+bug/1567052

# so we need VERBOSE=False until bagpipe-bgp uses rootwrap and is not run with sudo (same for bagpipe-fakerr)

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

# compiling a fresh OVS is done in gate_hook.sh

export COMPILE_OVS=True

27
devstack/gate_hook.sh

View File

@@ -1,2 +1,27 @@

# place holder until we have something useful to do here

#!/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

$GATE_DEST/devstack-gate/devstack-vm-gate.sh

8
devstack/plugin.sh

View File

@@ -1,8 +1,8 @@

#!/bin/bash

# Save trace setting

XTRACE=$(set +o | grep xtrace)

set +o xtrace

_XTRACE_NETWORKING_BGPVPN=$(set +o | grep xtrace)

set -o xtrace

if [[ "1ドル" == "source" ]]; then

# no-op

@@ -48,6 +48,6 @@ if [[ "1ドル" == "clean" ]]; then

:

fi

set +x

$xtrace

# Restore XTRACE

${_XTRACE_NETWORKING_BGPVPN}