summaryrefslogtreecommitdiffstats
path: root/ci
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 /ci
parentad81386dc5417dea8ffe85185109ce69f3379866 (diff)
parent2394885cd5009edfbd6fc9ecd7246db61552e28a (diff)
Merge "Install dpdk packages when dataplane is set to ovs_dpdk"
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 da1d29e2..7c07ae63 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