summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-10 21:34:23 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-10 21:34:23 +0000
commite2c2850bb337187918d27ea01715e79eefc5a7ee (patch)
treee330a182a09d99dd5c94a2bde77547ddb72c8bfc /build
parentad81386dc5417dea8ffe85185109ce69f3379866 (diff)
parent2394885cd5009edfbd6fc9ecd7246db61552e28a (diff)
Merge "Install dpdk packages when dataplane is set to ovs_dpdk"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-full.sh9
-rw-r--r--build/variables.sh8
2 files changed, 17 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 065201f8..af978edb 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -23,10 +23,19 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
pushd images > /dev/null
+dpdk_pkg_str=''
+for package in ${dpdk_rpms[@]}; do
+ curl -O "$dpdk_uri_base/$package"
+ dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
+done
+
# remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV
# enable connection tracking for protocal sctp
+# upload dpdk rpms but do not install
LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
+ --run-command "mkdir /root/dpdk_rpms" \
+ $dpdk_pkg_str \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
diff --git a/build/variables.sh b/build/variables.sh
index 115650da..ad1edf91 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -11,3 +11,11 @@
rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/
onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/
onos_release_file=onos-1.5.0.tar.gz
+
+dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv
+dpdk_rpms=(
+'ovs4opnfv-dpdk-16.04.0-2.el7.centos.x86_64.rpm'
+'ovs4opnfv-dpdk-devel-16.04.0-2.el7.centos.x86_64.rpm'
+'ovs4opnfv-dpdk-examples-16.04.0-2.el7.centos.x86_64.rpm'
+'ovs4opnfv-dpdk-tools-16.04.0-2.el7.centos.x86_64.rpm'
+) \ No newline at end of file