From 510d2519e2cfcddf7f88e692faeef2fee3f5a390 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 17 Mar 2017 23:34:54 -0400 Subject: Apex: baremetal to use vfio-pci driver, adds nosdn-fdio to daily Change-Id: I298b09f654dfe5efa64df9dc287fd586fcdf131d Signed-off-by: Tim Rozet --- jjb/apex/apex-deploy.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'jjb/apex/apex-deploy.sh') diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index c91e3ee82..564c9cdb8 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -196,6 +196,15 @@ else NETWORK_SETTINGS_DIR="/root/network" INVENTORY_FILE="/root/inventory/pod_settings.yaml" + # if fdio on baremetal, then we are using UCS enic and + # need to use vfio-pci instead of uio generic + if [[ "$DEPLOY_SCENARIO" == *fdio* ]]; then + TMP_DEPLOY_FILE="${WORKSPACE}/${DEPLOY_SCENARIO}.yaml" + cp -f ${DEPLOY_FILE} ${TMP_DEPLOY_FILE} + sed -i 's/^\(\s*uio-driver:\).*$/\1 vfio-pci/g' ${TMP_DEPLOY_FILE} + DEPLOY_FILE=${TMP_DEPLOY_FILE} + fi + if ! sudo test -e "$INVENTORY_FILE"; then echo "ERROR: Required settings file missing: Inventory settings file ${INVENTORY_FILE}" exit 1 -- cgit