From 2394885cd5009edfbd6fc9ecd7246db61552e28a Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Fri, 10 Jun 2016 09:01:30 -0400
Subject: Install dpdk packages when dataplane is set to ovs_dpdk

Change-Id: Ib9978595738bb70172244af0505b6b43b0bc60a2
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 build/overcloud-full.sh |  9 +++++++++
 build/variables.sh      |  8 ++++++++
 ci/deploy.sh            | 11 +++++------
 3 files changed, 22 insertions(+), 6 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
diff --git a/ci/deploy.sh b/ci/deploy.sh
index f9a5f0c7..25dc6aa4 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -803,11 +803,7 @@ function undercloud_prep_overcloud_deploy {
     exit 1
   fi
 
-  # Handle different dataplanes
-  if [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
-    echo "${red}ovs is the only currently available dataplane. ${deploy_options_array['dataplane']} not implemented${reset}"
-    exit 1
-  fi
+
 
   # Make sure the correct overcloud image is available
   if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then
@@ -841,9 +837,12 @@ EOF
                                                --upload uio_pci_generic.modules:/etc/sysconfig/modules/ \
                                                --run-command "chmod 0755 /etc/sysconfig/modules/vfio_pci.modules" \
                                                --run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \
+                                               --run-command "yum install -y /root/dpdk_rpms/*" \
                                                -a overcloud-full.qcow2
 EOI
-
+  elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
+    echo "${red}${deploy_options_array['dataplane']} not supported${reset}"
+    exit 1
   fi
 
   # Set ODL version accordingly
-- 
cgit 1.2.3-korg