From: Feng Pan <fpan@redhat.com>
Date: Thu, 4 May 2017 18:37:37 +0000 (-0400)
Subject: Add support for interface role mapping for odl_l3-fdio scenarios
X-Git-Tag: danube.2.0~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d358ad2a8a0716aea05c0c509149663ac4fad9df;p=apex.git

Add support for interface role mapping for odl_l3-fdio scenarios

JIRA: APEX-445
opnfv-puppet-tripleo-pr: 24

Change-Id: Idbb855badae2f2b91202961c12931ba54be1beaa
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 6f1a09a8..a31efbf9 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -186,6 +186,8 @@ EOI
     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}
+        sed -i "/ControllerExtraConfig:/ c\  ControllerExtraConfig:\n    tripleo::profile::base::neutron::agents::honeycomb::interface_role_mapping:  \"['${tenant_nic_mapping_controller_members}:tenant-interface']\"" ${ENV_FILE}
+        sed -i "/NovaComputeExtraConfig:/ c\  NovaComputeExtraConfig:\n    tripleo::profile::base::neutron::agents::honeycomb::interface_role_mapping:  \"['${tenant_nic_mapping_compute_members}:tenant-interface','${external_nic_mapping_compute_members}:public-interface']\"" ${ENV_FILE}
 EOI
     fi
   fi