From 891eab7f599c10e7986dcbfbf986f4ac32cd46d6 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 13 Sep 2011 16:16:17 +0000
Subject: [PATCH] When auto-selecting a nic appropriate for vmotion, ignore IMM
 interface when present

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10510 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 877138230..e23855056 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -1251,7 +1251,8 @@ sub enable_vmotion {
     if ($qnc->{selectedVnic}) {
         return 1;
     } else {
-        if (scalar @{$qnc->candidateVnic} eq 1) { #There is only one possible path, use it
+        my $vniccount=scalar @{$qnc->candidateVnic};
+        if ($vniccount==1 or ($vniccount==2 and $qnc->candidateVnic->[1]->spec->ip->ipAddress =~ /^169.254/)) { #There is only one possible path, use it
             $nicmgr->SelectVnicForNicType(nicType=>"vmotion",device=>$qnc->candidateVnic->[0]->device);
             return 1;
         } else {