Don't build dpdk/dppd in installed node

Change-Id: I080f16b3b7881abe0c01a0be6dbbd15f2e9d1270
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
This commit is contained in:
Ruijing Guo 2015-12-23 01:36:06 +00:00
parent 8e950c32dc
commit b2243e0133
6 changed files with 38 additions and 23 deletions

View File

@ -7,6 +7,8 @@ RUN apt-get install -y software-properties-common python-software-properties \
fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
ca-certificates sudo apt-utils lsb-release libtool autoconf automake build-essential fakeroot libssl-dev graphviz dh-autoreconf python-qt4 python-twisted-conch python-zopeinterface linux-headers-`uname -r`
RUN apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev
RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
RUN chmod 0440 /etc/sudoers.d/open-sudo

View File

@ -19,7 +19,9 @@ cd /
tar -czvf dpdk-${DPDK_VER}.tar.gz dpdk-${DPDK_VER}
cd dpdk-${DPDK_VER}
make install T=${RTE_TARGET}
find . | grep "\.o$" | xargs rm -rf
cd /
tar czvf dpdk-${DPDK_VER}.bin.tar.gz dpdk-${DPDK_VER}
git clone ${URL_OVS} openvswitch-dpdk
cd openvswitch-dpdk
@ -34,3 +36,15 @@ export DPDK_BUILD=${RTE_SDK}/${RTE_TARGET}
./configure --with-dpdk=$DPDK_BUILD
sed -i "s?set ovs-vswitchd unix?set ovs-vswitchd --dpdk -c 0x1 -n 4 -- unix?" utilities/ovs-ctl.in;sed -i "s?configure --with-linux?configure --with-dpdk=/dpdk-2.1.0/x86_64-native-linuxapp-gcc --with-linux?" debian/dkms.conf.in;sed -i "s?configure --with-linux?configure --with-dpdk=/dpdk-2.1.0/x86_64-native-linuxapp-gcc --with-linux?" debian/rules.modules;sed -i "s?configure --?configure -- --with-dpdk=/dpdk-2.1.0/x86_64-native-linuxapp-gcc?" debian/rules;make dist;tar -xzf openvswitch-2.4.90.tar.gz;
cd openvswitch-2.4.90;DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
cd /
wget https://01.org/sites/default/files/downloads/intel-data-plane-performance-demonstrators/dppd-prox-v021.zip
unzip dppd-prox-v021.zip
export RTE_SDK=/dpdk-${DPDK_VER}
export RTE_TARGET=x86_64-native-linuxapp-gcc
cd /dppd-PROX-v021
export DPPD_DIR=`pwd`; make
find . | grep "\.o$" | xargs rm -rf
cd /
tar czvf dppd-prox-v021.bin.tar.gz dppd-PROX-v021

View File

@ -26,11 +26,12 @@ function build_pkg {
sudo docker cp $container_id:/openvswitch/openvswitch-common_2.4.90-1_amd64.deb ${DIR}/repositories/ubuntu/ovs/
sudo docker cp $container_id:/openvswitch/openvswitch-datapath-dkms_2.4.90-1_all.deb ${DIR}/repositories/ubuntu/ovs/
sudo docker cp $container_id:/openvswitch/openvswitch-switch_2.4.90-1_amd64.deb ${DIR}/repositories/ubuntu/ovs/
sudo docker cp $container_id:/dpdk-2.1.0.tar.gz ${DIR}/repositories/ubuntu/dpdk/
sudo docker cp $container_id:/openvswitch-dpdk/openvswitch-common_2.4.90-1_amd64.deb ${DIR}/repositories/ubuntu/dpdk
sudo docker cp $container_id:/openvswitch-dpdk/openvswitch-datapath-dkms_2.4.90-1_all.deb ${DIR}/repositories/ubuntu/dpdk
sudo docker cp $container_id:/openvswitch-dpdk/openvswitch-switch_2.4.90-1_amd64.deb ${DIR}/repositories/ubuntu/dpdk
wget https://01.org/sites/default/files/downloads/intel-data-plane-performance-demonstrators/dppd-prox-v021.zip -O ${DIR}/repositories/ubuntu/dppd/dppd-prox-v021.zip
sudo docker cp $container_id:/dpdk-2.1.0.bin.tar.gz ${DIR}/repositories/ubuntu/dpdk/
sudo docker cp $container_id:/dppd-prox-v021.bin.tar.gz ${DIR}/repositories/ubuntu/dppd/
;;
*) echo "Not supported system"; exit 1;;
esac

View File

@ -2,22 +2,23 @@
NICS=$1
INSTALL_HOME=/usr/share/dpdk/
sudo rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/dpdk-2.1.0.tar.gz;
tar -xvzf dpdk-2.1.0.tar.gz
cd $INSTALL_HOME/dpdk-2.1.0; make install T=x86_64-native-linuxapp-gcc
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/dpdk-2.1.0.bin.tar.gz
tar xzvf dpdk-2.1.0.bin.tar.gz
rm -rf dpdk-2.1.0.bin.tar.gz
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/dpdk.init -O /etc/init.d/dpdk
chmod +x /etc/init.d/dpdk
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/dpdk.conf -O /etc/default/dpdk.conf
sed "s/DPDK_NIC_MAPPINGS=.*/DPDK_NIC_MAPPINGS=${NICS}/" -i /etc/default/dpdk.conf
sudo service dpdk start
service dpdk start
INSTALL_HOME=/usr/share/ovs-dpdk/
sudo rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/openvswitch-datapath-dkms_2.4.90-1_all.deb
sudo dpkg -i openvswitch-datapath-dkms_2.4.90-1_all.deb
dpkg -i openvswitch-datapath-dkms_2.4.90-1_all.deb
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/openvswitch-common_2.4.90-1_amd64.deb
sudo dpkg -i openvswitch-common_2.4.90-1_amd64.deb
dpkg -i openvswitch-common_2.4.90-1_amd64.deb
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dpdk/openvswitch-switch_2.4.90-1_amd64.deb
sudo dpkg -i openvswitch-switch_2.4.90-1_amd64.deb
dpkg -i openvswitch-switch_2.4.90-1_amd64.deb

View File

@ -1,12 +1,9 @@
#!/bin/bash
set -eux
INSTALL_HOME=/usr/share/dppd/
sudo rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
sudo apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dppd/dppd-prox-v021.zip;
unzip dppd-prox-v021.zip
export RTE_SDK=/usr/share/dpdk/dpdk-2.1.0
export RTE_TARGET=x86_64-native-linuxapp-gcc
cd /usr/share/dppd/dppd-PROX-v021
export DPPD_DIR=`pwd`; make
apt-get install -y pkg-config liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/dppd/dppd-prox-v021.bin.tar.gz
tar xzvf dppd-prox-v021.bin.tar.gz
rm -rf dppd-prox-v021.bin.tar.gz

View File

@ -2,11 +2,11 @@
set -eux
INSTALL_HOME=/usr/share/ovs/
sudo rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
rm -rf $INSTALL_HOME ; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/ovs/openvswitch-datapath-dkms_2.4.90-1_all.deb
sudo dpkg -i openvswitch-datapath-dkms_2.4.90-1_all.deb
dpkg -i openvswitch-datapath-dkms_2.4.90-1_all.deb
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/ovs/openvswitch-common_2.4.90-1_amd64.deb
sudo dpkg -i openvswitch-common_2.4.90-1_amd64.deb
dpkg -i openvswitch-common_2.4.90-1_amd64.deb
wget http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.5/repositories/ubuntu/ovs/openvswitch-switch_2.4.90-1_amd64.deb
sudo dpkg -i openvswitch-switch_2.4.90-1_amd64.deb
dpkg -i openvswitch-switch_2.4.90-1_amd64.deb