Revert "Adding support for DPDK to openvswitch image"

This reverts commit a3d324b5b6.

This causes issues [1] when trying to use the built image inside
the OSH repos, which is a first step of a pipeline from image
building to full testing.

[1]: http://logs.openstack.org/66/658766/1/check/openstack-helm-infra-openstack-support/c35a41e/

Change-Id: Ie7432a205f957ed13cf3f502daf05d6b8cdb32b8
This commit is contained in:
Jean-Philippe Evrard 2019-05-16 12:45:57 +02:00
parent e4169a2c24
commit bcb124acc1
1 changed files with 3 additions and 15 deletions

View File

@ -1,8 +1,7 @@
FROM k8s.gcr.io/debian-iptables-amd64:v10
LABEL maintainer="pete.birley@att.com"
ARG OVS_VERSION=2.10.1
ARG DPDK_VERSION=17.11.5
ARG OVS_VERSION=2.8.1
RUN set -ex ;\
export DEBIAN_FRONTEND=noninteractive ;\
@ -28,26 +27,15 @@ RUN set -ex ;\
python-all \
python-six \
python-twisted-conch \
python-zopeinterface \
libnuma-dev \
linux-headers-amd64 ;\
TMP_DIR=$(mktemp -d) ;\
curl -sSL http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.xz | tar xJ -C ${TMP_DIR} --strip-components=1 ;\
export DPDK_DIR=${TMP_DIR} ;\
cd ${DPDK_DIR} ;\
export DPDK_TARGET=x86_64-native-linuxapp-gcc ;\
export DPDK_BUILD=${DPDK_DIR}/${DPDK_TARGET} ;\
export RTE_KERNELDIR=/usr/src/$(ls -1 /usr/src/ | grep amd64) ;\
make install T=${DPDK_TARGET} DESTDIR=install ;\
python-zopeinterface ;\
TMP_DIR=$(mktemp -d) ;\
curl -sSL http://openvswitch.org/releases/openvswitch-${OVS_VERSION}.tar.gz | tar xz -C ${TMP_DIR} --strip-components=1 ;\
cd ${TMP_DIR} ;\
./boot.sh ;\
./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-dpdk=$DPDK_BUILD ;\
./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ;\
make ;\
make install ;\
cd / ;\
rm -rf ${DPDK_DIR} ;\
rm -rf ${TMP_DIR} ;\
apt-get purge --auto-remove -y \
build-essential \