summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-27 14:03:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-27 14:03:59 +0000
commit7d6129c6ce008c9ea9cc73c5e2a0f0062050d48a (patch)
tree607144035ac837973002a0660876f02e029f474a
parent2ea2ee214210f1eec14c8bdf91260ee883eb3192 (diff)
parentdc600bda635981edc035290faf901f54e810790e (diff)
Merge "Apply NSDriver patch for neutron for all FD.io scenarios"
-rwxr-xr-xlib/overcloud-deploy-functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 1301e2cd..8f5b1a21 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -164,7 +164,7 @@ EOI
fi
# Patch neutron with using OVS external interface for router and add generic linux NS interface driver
- if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
+ if [[ "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
-a overcloud-full.qcow2