commit b247b1d3efa81b3d1fa5b30be537d5d50c5c18c8
author David K. Bainbridge <dbainbri@ciena.com> Mon Aug 22 13:54:24 2016 -0700
committer David K. Bainbridge <dbainbri@ciena.com> Mon Aug 22 13:54:24 2016 -0700
tree 8fad771900cead4239f1afee715514ff67bd8ca1
parent c15f8e1231905cb83e0db014b8c1b3d7c72b23f0

make specification of fabric interfaces configurable

Change-Id: Id6db46e3bb0c13d1c2916255c5bd6419bc906e4b

roles/compute-node/files/rename_ifaces.sh

diff --git a/roles/compute-node/files/rename_ifaces.sh b/roles/compute-node/files/rename_ifaces.sh
index a490717..aa8e07c 100755
--- a/roles/compute-node/files/rename_ifaces.sh
+++ b/roles/compute-node/files/rename_ifaces.sh
@@ -48,24 +48,15 @@
     fi
     local DRIVER=$(ethtool -i $1 2>/dev/null | grep driver | awk '{print $2}')
     local RESULT="DNC"
-    case $DRIVER in
-            mlx4_en)
-            RESULT="MLX4_EN"
-            ;;
-        i40e)
-            RESULT="I40G"
-            ;;
-        ixgbe)
-            RESULT="10G"
-            ;;
-        *)
-            IS_PHY=$(ls -l /sys/class/net/$1 | grep -v virtual | wc -l)
-            if [ $IS_PHY -eq 1 ]; then
+    MATCH=$(echo "|$FABRIC_IFACE_SPEC|" | grep "|$DRIVER|" | wc -l)
+    if [ $MATCH -ne 0 ]; then
+        RESULT="FABRIC"
+    else
+        IS_PHY=$(ls -l /sys/class/net/$1 | grep -v virtual | wc -l)
+        if [ $IS_PHY -eq 1 ]; then
             RESULT="ETH"
-            fi
-            ;;
-        *) ;;
-    esac
+        fi
+    fi
     echo $RESULT
 }
 
@@ -209,6 +200,9 @@
     test -z $MGT_GW && MGT_GW=$(first $MGT_ADDR)
 fi
 
+FABRIC_IFACE_SPEC=$9
+test -z $FABRIC_IFACE_SPEC && FABRIC_IFACE_SPEC="i40e|mlx4_en"
+
 LIST_ETH=$(mktemp -u)
 LIST_FABRIC=$(mktemp -u)
 IFACES_FILE=$(mktemp -u)
@@ -222,7 +216,7 @@
         ETH)
             echo "$(get_mac $i)" >> $LIST_ETH
             ;;
-        I40G|MLX4_EN|10G)
+        FABRIC)
             echo "$(get_mac $i)" >> $LIST_FABRIC
             ;;
         *) ;;