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

Merge pull request #1696 from immarvin/onissue

Browse Source 
fix issue  [Customer] nodeset failed with meaningless messages #1529
This commit is contained in:
Xiaopeng Wang 2016-08-15 11:03:07 +08:00 committed by GitHub
commit 6f81ef16c4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -114,7 +114,8 @@ sub subvars {
}
unless ($master) {
die "Unable to identify master for $node";
$tmplerr = "Unable to identify master for $node";
return;
}
$ENV{XCATMASTER} = $master;
@ -1009,7 +1010,7 @@ sub kickstartnetwork {
$line .= $ulaaddr;
} elsif ($::XCATSITEVALS{managedaddressmode} =~ /static/) {
my ($ipaddr, $hostname, $gateway, $netmask) = xCAT::NetworkUtils->getNodeNetworkCfg($node);
unless ($ipaddr) { die "cannot resolve the network configuration of $node"; }
unless ($ipaddr) { $tmplerr = "cannot resolve the network configuration of $node"; return; }
if ($gateway eq '<xcatmaster>') {
@ -1116,9 +1117,9 @@ sub yast2network {
my $line;
my $hoststab;
my $mactab = xCAT::Table->new('mac', -create => 0);
unless ($mactab) { die "mac table should always exist prior to template processing when doing autoula"; }
unless ($mactab) { $tmplerr="mac table should always exist prior to template processing when doing autoula"; return;}
my $ent = $mactab->getNodeAttribs($node, ['mac'], prefetchcache => 1);
unless ($ent and $ent->{mac}) { die "missing mac data for $node"; }
unless ($ent and $ent->{mac}) { $tmplerr="missing mac data for $node"; return; }
my $suffix = xCAT::Utils->parseMacTabEntry($ent->{mac}, $node);
$suffix = lc($suffix);
@ -1128,7 +1129,7 @@ sub yast2network {
return "#YAST2NET autoula unsupported"
} elsif ($::XCATSITEVALS{managedaddressmode} =~ /static/) {
my ($ipaddr, $hostname, $gateway, $netmask) = xCAT::NetworkUtils->getNodeNetworkCfg($node);
unless ($ipaddr) { die "cannot resolve the network configuration of $node"; }
unless ($ipaddr) { $tmplerr = "cannot resolve the network configuration of $node"; return; }
if ($gateway eq '<xcatmaster>') {
my @gatewayd = xCAT::NetworkUtils->my_ip_facing($ipaddr);