From d6cc43a39fbb79763db0d9de19b5ab0b4af630f7 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Fri, 17 Mar 2017 15:20:10 -0400
Subject: [PATCH] Fixes neutron patch to only apply when ODL + FDIO

We don't want the neutorn patch which hardcodes router external
interface to OVS and adds generic NS linux interface driver to be
applied for every scenario.

JIRA: APEX-406

Change-Id: I0fd7ed07a5ff58f9e1565831f4f469c11b501385
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 build/overcloud-full.sh           |  2 --
 build/overcloud-opendaylight.sh   |  2 ++
 lib/overcloud-deploy-functions.sh | 13 ++++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 59544d7b..811249b4 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -145,8 +145,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install /root/$tackerclient_pkg \
     --run-command "pip install python-senlinclient" \
     --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \
-    --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
-    --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
     --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \
     --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 <  puppet-neutron-add-odl-settings.patch" \
     --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index f892c712..498154d8 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -80,6 +80,7 @@ populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga.tar.gz
 # Patch in OPNFV custom puppet-tripleO
 # install Honeycomb
 # install quagga/zrpc
+# upload neutron patch for generic NS linux interface driver + OVS for external networks
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
     --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
@@ -109,6 +110,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum downgrade -y python-zmq-14.3.1" \
     --install zeromq-4.1.4,zeromq-devel-4.1.4 \
     --install capnproto-devel,capnproto-libs,capnproto \
+    --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
     -a overcloud-full-opendaylight_build.qcow2
 
 LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 36346d85..de7263f3 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -149,11 +149,18 @@ EOI
 EOI
   fi
 
-  #Configure routing node for odl_l3-fdio
-  if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' && "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
+  # 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
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-       sed -i "/opendaylight::vpp_routing_node:/c\    opendaylight::vpp_routing_node: ${deploy_options_array['odl_vpp_routing_node']}.${domain_name}" ${ENV_FILE}
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
+                                               -a overcloud-full.qcow2
+EOI
+    # Configure routing node for odl_l3-fdio
+    if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+        sed -i "/opendaylight::vpp_routing_node:/c\    opendaylight::vpp_routing_node: ${deploy_options_array['odl_vpp_routing_node']}.${domain_name}" ${ENV_FILE}
 EOI
+    fi
   fi
 
   if [ -n "${deploy_options_array['performance']}" ]; then
-- 
2.16.6