xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

if no ip definition get ip from getipaddr function

Browse Source
This commit is contained in:
XuWei 2016-11-08 02:39:59 -05:00
parent 0c49aa43c8
commit 7108fcb713
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-probe/subcmds/discovery
View File

@ -844,11 +844,18 @@ sub get_node_ip {
foreach my $node (keys %nodeipcheck) {
$ip_net = xCAT::NetworkUtils->getipaddr($node);
my $isonmynet = xCAT::NetworkUtils->nodeonmynet($node);
if ($nodeipcheck{$node}{"ip"} and $ip_net and ($nodeipcheck{$node}{"ip"} ne $ip_net)) {
$nodeipcheck{$node}{"error"} = "IP $nodeipcheck{$node}{\"ip\"} definition for $node is not correct";
$nodeipcheck{$node}{"ip"} = $ip_net;
} elsif (!$nodeipcheck{$node}{"ip"} and $ip_net) {
$nodeipcheck{$node}{"ip"} = $ip_net;
}
if ($ip_net and !$isonmynet) {
$nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached.";
} elsif (!$isonmynet) {
$nodeipcheck{$node}{"error"} = "Can not get IP for $node.";
}
$nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached, please run 'makehosts' and 'makedns -n'." unless (xCAT::NetworkUtils->nodeonmynet($node));
}
return %nodeipcheck;