commit de51ce5e004bbe5342b282fcee49dbd4d7dc7809
author David K. Bainbridge <dbainbri@ciena.com> Mon Aug 22 13:54:24 2016 -0700
committer David Bainbridge <dbainbri@ciena.com> Mon Aug 22 16:26:52 2016 -0700
tree 2b791cc2710a592cab4e9af77c01d2cad416bab2
parent e80fd395e00473c42c34648bfae9a0bcceea265c

make specification of fabric interfaces configurable

Change-Id: Id6db46e3bb0c13d1c2916255c5bd6419bc906e4b
(cherry picked from commit b247b1d3efa81b3d1fa5b30be537d5d50c5c18c8)

build.gradle

diff --git a/build.gradle b/build.gradle
index 0f50779..c54afc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -296,6 +296,7 @@
             .p(config.seedServer.fabric_ip, "fabric_ip")
             .p(config.seedServer.fabric_network, "fabric_network")
             .p(config.seedServer.fabric_iface, "fabric_iface")
+            .p(config.seedServer.fabric_iface_spec, "fabric_iface_spec")
             .p(config.seedServer.domain, "domain")
 	    .p(config.seedServer.virtualbox_support, "virtualbox_support")
             .p(config.seedServer.power_helper_user, "power_helper_user")
@@ -354,6 +355,7 @@
 	    .p(config.seedServer.fabric_ip, "fabric_ip")
 	    .p(config.seedServer.fabric_network, "fabric_network")
 	    .p(config.seedServer.fabric_iface, "fabric_iface")
+            .p(config.seedServer.fabric_iface_spec, "fabric_iface_spec")
             .p(config.seedServer.domain, "domain")
             .p(config.seedServer.virtualbox_support, "virtualbox_support")
 	    .p(config.seedServer.power_helper_user, "power_helper_user")

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
             ;;
         *) ;;

roles/compute-node/tasks/main.yml

diff --git a/roles/compute-node/tasks/main.yml b/roles/compute-node/tasks/main.yml
index 236fae4..f74ab55 100644
--- a/roles/compute-node/tasks/main.yml
+++ b/roles/compute-node/tasks/main.yml
@@ -152,7 +152,7 @@
 
 - name: Consistent Interface Naming
   become: yes
-  script: files/rename_ifaces.sh "{{ compute_node.interfaces.fabric }}" "{{ compute_node.addresses.fabric }}" "{{ compute_node.interfaces.external }}" "{{ compute_node.addresses.external }}" "{{ compute_node.gateway.external }}" "{{ compute_node.interfaces.management }}" "{{ compute_node.addresses.management }}" "{{ compute_node.gateway.management }}"
+  script: files/rename_ifaces.sh "{{ compute_node.interfaces.fabric }}" "{{ compute_node.addresses.fabric }}" "{{ compute_node.interfaces.external }}" "{{ compute_node.addresses.external }}" "{{ compute_node.gateway.external }}" "{{ compute_node.interfaces.management }}" "{{ compute_node.addresses.management }}" "{{ compute_node.gateway.management }}" "{{ compute_node.fabric_iface_match }}"
   register: ifaces_changed
   changed_when: ifaces_changed.stdout.find("true") != -1
   tags:

roles/compute-node/vars/main.yml

diff --git a/roles/compute-node/vars/main.yml b/roles/compute-node/vars/main.yml
index 05425ea..62c9f19 100644
--- a/roles/compute-node/vars/main.yml
+++ b/roles/compute-node/vars/main.yml
@@ -1,6 +1,7 @@
 pub_ssh_key: "{{ lookup('file', 'files/id_rsa.pub') }}"
 
 compute_node:
+    fabric_iface_match: "{{ fabric_iface_spec | default('i40e|mlx4_en') }}"
     interfaces:
         fabric: "{{ fabric_iface | default('fabric') }}"
         management: "{{ management_iface | default('mgmtbr') }}"