Merge "Add support for interface role mapping for odl_l3-fdio scenarios"

diff --cc lib/overcloud-deploy-functions.sh
index 9017d3b,92a7529..e98ea9c
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -182,7 -181,15 +182,7 @@@ EO
                                                 -a overcloud-full.qcow2
  EOI
  
-     # Configure routing node for odl-fdio
 -    # Disable clustering for ODL FDIO HA scenarios
 -    if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
 -      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 -      LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /etc/puppet/modules/tripleo/ && patch -p1 < disable_odl_clustering.patch" \
 -                                               -a overcloud-full.qcow2
 -EOI
 -    fi
 -
+     # Configure routing node and interface role mapping for odl-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}