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

fix issue4267:there are multiple IP configured on the deploy NIC of MN, xcatprobe osdeploy failed to obtain the NIC.

Browse Source
This commit is contained in:
hu-weihua 2017-11-14 22:12:39 -05:00
parent 48bc2b4959
commit 6c6c318b60
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-probe/subcmds/osdeploy
View File

@ -154,7 +154,10 @@ if ($debug) {
}
#if failed to pass pre-check, exit directly
exit $rst if ($rst);
if ($rst){
probe_utils->send_msg("stdout", "f", "Provison pre-check");
exit $rst;
}
# record every status's start time and end time for each node
# $node_status_time{$node}{$status}{start_time} = $start_time;
@ -203,7 +206,7 @@ sub do_pre_check {
my @error = ();
my $sub_func_rst = obtain_install_nic(\$installnic, \@error);
if ($sub_func_rst) {
probe_utils->send_msg("stdout", "f", "Failed to obtain install NIC in current server");
probe_utils->send_msg("stdout", "f", "Obtain install NIC in current server");
probe_utils->send_msg("stdout", "d", "$_") foreach (@error);
} else {
probe_utils->send_msg("stdout", "i", "The install NIC in current server is $installnic");
@ -248,7 +251,7 @@ sub obtain_install_nic {
return 1;
}
$$installnic_ref = `ip addr |grep -B2 $master_ip_in_site|awk -F" " '/mtu/{gsub(/:/,"",\$2); print \$2}'`;
$$installnic_ref = `ip -4 -o a|awk -F"\\\\" '/$master_ip_in_site/ {print \$1}' |awk -F" " '{print \$NF}'`;
chomp($$installnic_ref);
if (!$$installnic_ref) {
push @$return_error_ref, "The value of 'master' in 'site' table is $master_ip_in_site, can't get corresponding network interface in current server";