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@12884 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-05-23 02:57:41 +00:00
parent c49f9ed82b
commit 2be38ac386
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-server/lib/xcat/plugins/iscsi.pm
View File

@ -64,18 +64,22 @@ sub process_request {
}
my $iscsitab = xCAT::Table->new('iscsi');
my @nodes = @{$request->{node}};
my $sitetab = xCAT::Table->new('site');
unless ($sitetab) {
$callback->({error=>"Fatal error opening site table",errorcode=>[1]});
return;
}
#my $sitetab = xCAT::Table->new('site');
#unless ($sitetab) {
# $callback->({error=>"Fatal error opening site table",errorcode=>[1]});
# return;
#}
my $domain;
(my $ipent) = $sitetab->getAttribs({key=>'domain'},'value');
if ($ipent and $ipent->{value}) { $domain = $ipent->{value}; }
($ipent) = $sitetab->getAttribs({key=>'iscsidir'},'value');
#(my $ipent) = $sitetab->getAttribs({key=>'domain'},'value');
my @entries = xCAT::Utils->get_site_attribute("domain");
my $t_entry = $entries[0];
if ( defined($t_entry) ) { $domain = $t_entry; }
#($ipent) = $sitetab->getAttribs({key=>'iscsidir'},'value');
my $iscsiprefix;
if ($ipent and $ipent->{value}) {
$iscsiprefix = $ipent->{value};
my @entries = xCAT::Utils->get_site_attribute("iscsidir");
my $t_entry = $entries[0];
if ( defined($t_entry) ) {
$iscsiprefix = $t_entry;
}
foreach my $node (@nodes) {
my $fileloc;