From 1a395e124833173ab69fa86d46837c35db55a3d0 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Tue, 2 May 2017 14:19:15 -0400
Subject: 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>
---
 lib/overcloud-deploy-functions.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 542e9cfc..92a7529e 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -189,10 +189,12 @@ EOI
 EOI
     fi
 
-    # Configure routing node for odl-fdio
+    # 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}
+        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
-- 
cgit 1.2.3-korg