summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-03-24 12:11:58 -0400
committerFeng Pan <fpan@redhat.com>2017-03-24 12:11:58 -0400
commitdc600bda635981edc035290faf901f54e810790e (patch)
tree595caec51afd7f15dbee1f10c4a20c2bf242ee9a
parent5f50df9743156ea805256e2f65815ed0075881f6 (diff)
Apply NSDriver patch for neutron for all FD.io scenarios
Change-Id: I548a6c948a276f05fd2bb0c2b6bcb9ee8d96deb8 Signed-off-by: Feng Pan <fpan@redhat.com>
-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 8362964d..97f809da 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -150,7 +150,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