arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For the places that open site table to read attributes, change to call xCAT::Utils->get_site_attribute instead

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12860 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua
2012-05-22 06:32:20 +00:00
parent 403326620f
commit 8c13b3f50a
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@@ -20,19 +20,21 @@ my $iscsitab;
my $bptab;
my $typetab;
my $restab;
my $sitetab;
#my $sitetab;
my $hmtab;
my $tftpdir="/tftpboot";
my $nonodestatus=0;
my $sitetab = xCAT::Table->new('site');
if ($sitetab) {
(my $ref1) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
if ($ref1) {
if ($ref1->{value} =~ /0|n|N/) { $nonodestatus=1; }
#my $sitetab = xCAT::Table->new('site');
#if ($sitetab) {
#(my $ref1) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
my @entries = xCAT::Utils->get_site_attribute("nodestatus");
my $site_entry = $entries[0];
if ( defined($site_entry) ) {
if ($site_entry =~ /0|n|N/) { $nonodestatus=1; }
}
}
#}
sub handled_commands {
@@ -230,11 +232,15 @@ sub setdestiny {
$restab=xCAT::Table->new('noderes',-create=>1);
my $bootparms=xCAT::Table->new('bootparams',-create=>1);
my $nodetype = xCAT::Table->new('nodetype');
my $sitetab = xCAT::Table->new('site');
#my $sitetab = xCAT::Table->new('site');
my $nodehm = xCAT::Table->new('nodehm');
my $hments = $nodehm->getNodesAttribs(\@nodes,['serialport','serialspeed','serialflow']);
(my $portent) = $sitetab->getAttribs({key=>'xcatdport'},'value');
(my $mastent) = $sitetab->getAttribs({key=>'master'},'value');
#(my $portent) = $sitetab->getAttribs({key=>'xcatdport'},'value');
my @entries = xCAT::Utils->get_site_attribute("xcatdport");
my $port_entry = $entries[0];
#(my $mastent) = $sitetab->getAttribs({key=>'master'},'value');
my @entries = xCAT::Utils->get_site_attribute("master");
my $master_entry = $entries[0];
my $enthash = $nodetype->getNodesAttribs(\@nodes,[qw(arch)]);
my $resents = $restab->getNodeAttribs(\@nodes,[qw(xcatmaster)]);
foreach (@nodes) {
@@ -247,8 +253,8 @@ sub setdestiny {
my $ent = $resents->{$_}->[0]; #$restab->getNodeAttribs($_,[qw(xcatmaster)]);
my $master;
my $kcmdline = "quiet ";
if ($mastent and $mastent->{value}) {
$master = $mastent->{value};
if ( defined($master_entry) ) {
$master = $master_entry;
}
if ($ent and $ent->{xcatmaster}) {
$master = $ent->{xcatmaster};
@@ -271,8 +277,8 @@ sub setdestiny {
return;
}
my $xcatdport="3001";
if ($portent and $portent->{value}) {
$xcatdport = $portent->{value};
if ( defined($port_entry)) {
$xcatdport = $port_entry;
}
if (-r "$tftpdir/xcat/genesis.kernel.$arch") {
if (-r "$tftpdir/xcat/genesis.fs.$arch.lzma") {
@@ -451,8 +457,10 @@ sub getdestiny {
my $nrents = $restab->getNodesAttribs(\@nodes,[qw(tftpserver xcatmaster)]);
$bptab = xCAT::Table->new('bootparams',-create=>1);
my $bpents = $bptab->getNodesAttribs(\@nodes,[qw(kernel initrd kcmdline xcatmaster)]);
my $sitetab= xCAT::Table->new('site');
(my $sent) = $sitetab->getAttribs({key=>'master'},'value');
#my $sitetab= xCAT::Table->new('site');
#(my $sent) = $sitetab->getAttribs({key=>'master'},'value');
my @entries = xCAT::Utils->get_site_attribute("master");
my $master_value = $entries[0];
my %node_status=();
foreach $node (@nodes) {
@@ -504,8 +512,8 @@ sub getdestiny {
$response{imgserver}=$nrent->{tftpserver};
} elsif (defined $nrent->{xcatmaster}) {
$response{imgserver}=$nrent->{xcatmaster};
} elsif (defined($sent->{value})) {
$response{imgserver}=$sent->{value};
} elsif (defined( $master_value )) {
$response{imgserver}=$master_value;
} else {
$response{imgserver} = xCAT::Utils->my_ip_facing($node);
}