summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-04 18:23:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-04 18:23:57 +0000
commitd2c15307b89e5229df783bb25a099d0580197cc2 (patch)
tree4865fb3168de30d016e72f1bd7f395685e2dcc76
parentfcd5a75810ed9167baf6e5da4ab20b59f7ab1de4 (diff)
parent1a395e124833173ab69fa86d46837c35db55a3d0 (diff)
Merge "Add support for interface role mapping for odl_l3-fdio scenarios"
-rwxr-xr-xlib/overcloud-deploy-functions.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 9017d3b1..e98ea9ca 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -182,10 +182,12 @@ EOI
-a overcloud-full.qcow2
EOI
- # 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