From eae889b38209f58f169356cc2229658fbb616bbd Mon Sep 17 00:00:00 2001 From: Ray Kinsella Date: Sun, 4 Dec 2016 18:21:16 +0000 Subject: vpp-bootstrap: * Updated to VPP 17.01 * Updated README.md * Reduced image requirements to 2 cores & 2048 megs of ram. * Fixed VPP Binary on host to have more modest resource requirements. * XConnect the Containers automagically in VPP on the host. * Added support for python `pip` packages, updated scapy to 2.3.x for VXLAN support. * Using the VPP Binaries from 17.01 stable, instead of head. * Added gdb package to ctwo, so `make debug` will work. * Renamed veth backend interfaces on the host to `veth-c[one,two]`. Change-Id: Ie1a86989733c1eb18041e20a4d268a308ffaebb3 Signed-off-by: Ray Kinsella --- vpp-bootstrap/containers/ctwo.provision.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'vpp-bootstrap/containers/ctwo.provision.sh') diff --git a/vpp-bootstrap/containers/ctwo.provision.sh b/vpp-bootstrap/containers/ctwo.provision.sh index 2ba66c6..d8e5796 100755 --- a/vpp-bootstrap/containers/ctwo.provision.sh +++ b/vpp-bootstrap/containers/ctwo.provision.sh @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +VPP_VERSION=v17.01 VPP_DIR=~/vpp VPP_GIT="https://git.fd.io/vpp" -#PLATFORM=vpp_lite -PLATFORM=vpp +PLATFORM=vpp_lite echo Cloning $VPP_GIT git clone $VPP_GIT $VPP_DIR @@ -23,6 +23,7 @@ git clone $VPP_GIT $VPP_DIR # Install dependencies echo Building $VPP_DIR cd $VPP_DIR +git checkout -b $VPP_VERSION $VPP_VERSION make UNATTENDED=yes install-dep make wipe @@ -31,10 +32,7 @@ rm -f build-root/.bootstrap.ok # Build and install packaging make PLATFORM=$PLATFORM bootstrap -make PLATFORM=$PLATFORM pkg-deb - -# Install VPPP -(cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb) - -sudo sed -i 's/dpdk {/dpdk {\n\tno-pci\n/' /etc/vpp/startup.conf -sudo service vpp start +make PLATFORM=$PLATFORM build +#not sure why this is needed to called explicitly +make PLATFORM=$PLATFORM build-vpp-api +make PLATFORM=$PLATFORM plugins -- cgit 1.2.3-korg