From 82069dccf58d9971b422e6b1548bd329de40e81d Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 13 Dec 2017 14:34:20 -0500 Subject: [PATCH 1/2] Check for LinkLocal as well as 169.254 IP address --- xCAT-server/lib/xcat/plugins/openbmc.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index f684bfab3..1b057e446 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -2819,7 +2819,10 @@ sub rspconfig_response { my ($path, $adapter_id) = (split(/\/ipv4\//, $key_url)); if ($adapter_id) { - if (defined($content{Origin}) and ($content{Origin} =~ /LinkLocal/)) { + if ( (defined($content{Origin}) and $content{Origin} =~ /LinkLocal/) or + (defined($content{Address}) and $content{Address} =~ "169.254") ) { + # OpenBMC driver has a interim bug where ZeroConfigIP comes up as DHCP instead of LinkLocal. + # To protect xCAT while the drivers change, check the 169.254 IP also if ($xcatdebugmode) { my $debugmsg = "Found LocalLink " . $content{Address} . " for interface " . $key_url . " Ignoring..."; process_debug_info($node, $debugmsg); From f21f143367568067c144917f06db7f1dae32087f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Dec 2017 02:26:47 -0500 Subject: [PATCH 2/2] only ignore 169.254.x.x for OpenBMC --- xCAT-server/lib/xcat/plugins/openbmc.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index 1b057e446..b4538cc0a 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -2820,7 +2820,7 @@ sub rspconfig_response { if ($adapter_id) { if ( (defined($content{Origin}) and $content{Origin} =~ /LinkLocal/) or - (defined($content{Address}) and $content{Address} =~ "169.254") ) { + (defined($content{Address}) and $content{Address} =~ /^169.254/) ) { # OpenBMC driver has a interim bug where ZeroConfigIP comes up as DHCP instead of LinkLocal. # To protect xCAT while the drivers change, check the 169.254 IP also if ($xcatdebugmode) {