Merge pull request #7418 from Obihoernchen/ipoib_provisioning

Allow IPoIB MAC addresses for provisioning via IPoIB

xCAT-server/lib/xcat/plugins/dhcp.pm

@@ -610,7 +610,7 @@ sub addnode
             $hname = $node;
         }                                #Default to hostname equal to nodename
         unless ($mac) { next; }          #Skip corrupt format
-        if ($mac !~ /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5,7}$|^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5,7}$/)
+        if ($mac !~ /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5,8}$|^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5,8}$/)
         {
             $callback->(
                 {
@@ -764,8 +764,8 @@ sub addnode
                         $hostname = $1 . "-hf" . $count;
                     }
                 }
-            } elsif (length($mac) == 23) { # 8 bytes of mac address
-		# Currently the only thing that has 8 bytes is an infiniband
+            } elsif (length($mac) == 23 || length($mac) == 26) { # 8 or 9 bytes of mac address
+		# Currently the only thing that has 8 or 9 bytes is an infiniband
 		# or infiniband like device, which is type 32 (0x20).
                 $hardwaretype = 32;
             }