summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-06-10 09:01:30 -0400
committerFeng Pan <fpan@redhat.com>2016-06-10 15:12:50 -0400
commit2394885cd5009edfbd6fc9ecd7246db61552e28a (patch)
treef9c089a2e99db5f1f06af0507c921773dca4075a /ci
parent5d889e95dbcab85e6d073b7b6d29e3ea5b47f87d (diff)
Install dpdk packages when dataplane is set to ovs_dpdk
Change-Id: Ib9978595738bb70172244af0505b6b43b0bc60a2 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh11
1 files changed, 5 insertions, 6 deletions
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