summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-17 15:20:10 -0400
committerTim Rozet <trozet@redhat.com>2017-03-17 15:34:53 -0400
commitd6cc43a39fbb79763db0d9de19b5ab0b4af630f7 (patch)
tree4f26df5c2dc038c15a0c9a0319eaa12b204dc0f5 /lib/overcloud-deploy-functions.sh
parentcdeac78e8253804bbb486d8fc24fefbec928d796 (diff)
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>
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh13
1 files changed, 10 insertions, 3 deletions
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