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

add dhcpinterfaces in servicenode table

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14615 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2012-12-11 11:09:05 +00:00
parent c3e8949e81
commit e7c5f506fe
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@ -889,11 +889,23 @@ sub process_request
return;
}
#my $sitetab = xCAT::Table->new('site');
my $servicenodetab = xCAT::Table->new('servicenode');
my @nodeinfo = xCAT::Utils->determinehostname;
my $nodename = pop @nodeinfo; # get hostname
my $dhcpinterfaces = $servicenodetab->getNodeAttribs($nodename, ['dhcpinterfaces']);
my %activenics;
my $querynics = 1;
#if ($sitetab)
#{
if ( xCAT::Utils->isServiceNode() and $dhcpinterfaces and $dhcpinterfaces->{dhcpinterfaces} ) {
my @dhcpifs = split ',', $dhcpinterfaces->{dhcpinterfaces};
foreach my $nic ( @dhcpifs ) {
$activenics{$nic} = 1;
$querynics = 0;
}
}
else
{
#my $href;
#($href) = $sitetab->getAttribs({key => 'dhcpinterfaces'}, 'value');
my @entries = xCAT::TableUtils->get_site_attribute("dhcpinterfaces");
@ -972,7 +984,7 @@ sub process_request
return;
}
$domain = $t_entry;
#}
}
@dhcpconf = ();
@dhcp6conf = ();