xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

polished

Browse Source
This commit is contained in:
bybai
2017-08-04 00:33:54 -04:00
parent 447b00af5b
commit c87dd2c763
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@ -18,7 +18,7 @@ use xCAT::Template;
use xCAT::SvrUtils;
use xCAT::Zone;
#use Data::Dumper;
use Data::Dumper;
use File::Basename;
use Socket;
use strict;
@ -1530,12 +1530,6 @@ sub collect_all_attribs_for_tables_in_template
if ($ent->{$node}->[0]) {
foreach my $attrib (@attribs) {
$::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib} = $ent->{$node}->[0]->{$attrib};
#If nicips contains regular expression
if ($tabname =~ /^nics$/ && $attrib =~ /^nicips$/ &&
$::GLOBAL_TAB_HASH{nics}{$node}{nicips} =~ /\S*\!\|\S*/)
{
$::GLOBAL_TAB_HASH{nics}{$node}{nicips}=get_nics_nicips($node,$::GLOBAL_TAB_HASH{nics}{$node}{nicips});
}
#for noderes.xcatmaster
if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ &&
(!exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster}) ||
@ -1572,7 +1566,11 @@ sub collect_all_attribs_for_tables_in_template
!defined($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster})) {
$::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster} = $::XCATSITEVALS{master};
}
#If nicips contains regular expression
if (exists($::GLOBAL_TAB_HASH{nics}{$node}{nicips}) && $::GLOBAL_TAB_HASH{nics}{$node}{nicips} =~ /\S*\!\|\S*/)
{
$::GLOBAL_TAB_HASH{nics}{$node}{nicips}=get_nics_nicips($node,$ent->{$node}->[0]->{nicips});
}
if (!defined($::GLOBAL_TAB_HASH{noderes}{$node}{nfsserver})) {
$::GLOBAL_TAB_HASH{noderes}{$node}{nfsserver} = $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster};
}