diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-28 12:20:28 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-28 12:20:28 -0400 |
| commit | d76961462b0b94566a29254278609df16a144643 (patch) | |
| tree | 68fdb5b41f2c0b5020949d67d4c50af18ca8fffa | |
| parent | 4ba6837774ec06ddb75592ff567d53868a44bc46 (diff) | |
Apex: disables vfio-pci for baremetal fdio
According to FDS folks, uio_pci_generic (default) should work with UCSB
baremetal. We also hit a bug in UCSB where vfio-pci isn't working with
VPP. Therefore falling back to uio_pci_generic.
Change-Id: Id9a6fe5be91aaf8476292a46c15c6e876616f4a6
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 564c9cdb8..6343b838b 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -196,14 +196,16 @@ else NETWORK_SETTINGS_DIR="/root/network" INVENTORY_FILE="/root/inventory/pod_settings.yaml" +# (trozet) According to FDS folks uio_pci_generic works with UCS-B +# and there appears to be a bug with vfio-pci # 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 [[ "$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}" |