diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-18 02:59:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-18 02:59:38 +0000 |
| commit | 8c1c4b287a989082081b218fe73670ff443c651d (patch) | |
| tree | 5d1040c2477110dccabb5784d4499d3cf5033c23 /lib | |
| parent | 4d5ea2088607c032c848f284d1c44f07f24d8747 (diff) | |
| parent | deccaf2df412d64b85eb4b9cd64af0ca24d551d6 (diff) | |
Merge "Fixes neutron patch to only apply when ODL + FDIO" into stable/danube
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 13 |
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 |