summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-03-24 12:11:58 -0400
committerTim Rozet <trozet@redhat.com>2017-03-27 14:04:04 +0000
commit33828db100ef502c8ef4eb66380d10a83a08d182 (patch)
tree607144035ac837973002a0660876f02e029f474a
parent1dc83b5751dc3c86b3b68f4734ec9fd1761be54f (diff)
Apply NSDriver patch for neutron for all FD.io scenarios
Change-Id: I548a6c948a276f05fd2bb0c2b6bcb9ee8d96deb8 Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit dc600bda635981edc035290faf901f54e810790e)
-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 1301e2c..8f5b1a2 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