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 issueNode range not specified, see man page for syntax. return with no output when site.master is not set #4299

Browse Source
This commit is contained in:
immarvin 2017-11-16 01:31:59 -05:00
parent cb0c90aaa9
commit 593a6215e8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perl-xCAT/xCAT/ServiceNodeUtils.pm
View File

@ -509,8 +509,11 @@ sub get_ServiceNode
# get site.master this will be the default
my $master = xCAT::TableUtils->get_site_Master();
$noderestab = xCAT::Table->new('noderes');
unless($master){
xCAT::MsgUtils->message('SW',"site.master is not set!\n");
}
$noderestab = xCAT::Table->new('noderes');
unless ($noderestab) # no noderes table, use default site.master
{
xCAT::MsgUtils->message('I',
@ -548,7 +551,7 @@ sub get_ServiceNode
my $key = $rec->{$snattribute};
push @{ $snhash{$key} }, $node;
}
else # use site.master
elsif($master) # use site.master
{
push @{ $snhash{$master} }, $node;
}
@ -595,7 +598,7 @@ sub get_ServiceNode
my $key = $rec->{$snattribute};
push @{ $snhash{$key} }, $node;
}
else
elsif($master)
{ # use site.master
push @{ $snhash{$master} }, $node;
}
@ -631,7 +634,7 @@ sub get_ServiceNode
my $key = $rec->{$snattribute};
push @{ $snhash{$key} }, $node;
}
else
elsif($master)
{ # use site.master
push @{ $snhash{$master} }, $node;
}
@ -675,7 +678,7 @@ sub get_ServiceNode
my $key = $sn->{$snattribute};
push @{ $snhash{$key} }, $node;
}
else
elsif($master)
{ # no service node use master
push @{ $snhash{$master} }, $node;
}