Fix TenantNIC and PublicNIC config

- We now check if vairables (public/private)_(compute/controller)_interface
  are set before performing substitution. If those variables are not set,
  default values (nic2 for private and nic3 for public) are used.
- Change TenantNIC and PublicNIC variables to be role specific.

opnfv-tht-pr: 80

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

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 15787b9..ad51846 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -38,4 +38,5 @@
 76,Add networking-vpp ML2 mechanism driver
 77,Update FDIO to use opendaylight_v2 mechanism driver
 78,Fix spelling mistake in specs filter
-79,Fix controller and compute ip array
\ No newline at end of file
+79,Fix controller and compute ip array
+80,Change TenantNIC and PublicNIC to be role specific
\ No newline at end of file

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 498fd13..c7301fd 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -178,8 +178,20 @@ EOI
 
     # set NIC heat params and resource registry
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-sudo sed -i '/TenantNIC:/c\  TenantNIC: '${private_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
-sudo sed -i '/PublicNIC:/c\  PublicNIC: '${public_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+if [ -n "${private_network_compute_interface}" ]; then
+  sudo sed -i '/ComputeTenantNIC:/c\  ComputeTenantNIC: '${private_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+fi
+if [ -n "${private_network_controller_interface}" ]; then
+  sudo sed -i '/ControllerTenantNIC:/c\  ControllerTenantNIC: '${private_network_controller_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+fi
+# TODO: PublicNIC is not used today, however, in the future, we'll bind public nic to DPDK as well for certain scenarios. At that time,
+# we'll need to make sure public network is enabled.
+if [ -n "${public_network_compute_interface}" ]; then
+  sudo sed -i '/ComputePublicNIC:/c\  ComputePublicNIC: '${public_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+fi
+if [ -n "${public_network_controller_interface}" ]; then
+  sudo sed -i '/ControllerPublicNIC:/c\  ControllerPublicNIC: '${public_network_controller_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+fi
 EOI
 
     DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml"