Merge branch '2.7' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.7

This commit is contained in:
lissav 2013-12-06 13:23:54 -05:00
commit d4c6c267e8

2
xCAT-server/lib/xcat/plugins/destiny.pm Normal file → Executable file
View File

@ -236,7 +236,7 @@ sub setdestiny {
(my $portent) = $sitetab->getAttribs({key=>'xcatdport'},'value');
(my $mastent) = $sitetab->getAttribs({key=>'master'},'value');
my $enthash = $nodetype->getNodesAttribs(\@nodes,[qw(arch)]);
my $resents = $restab->getNodeAttribs(\@nodes,[qw(xcatmaster)]);
my $resents = $restab->getNodesAttribs(\@nodes,[qw(xcatmaster)]);
foreach (@nodes) {
my $ent = $enthash->{$_}->[0]; #$nodetype->getNodeAttribs($_,[qw(arch)]);
unless ($ent and $ent->{arch}) {