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

support <xcatmaster> keyword in site/networks table.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9535 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sjing
2011-05-10 08:21:51 +00:00
parent 74aeca03de
commit be3afc4ced
1 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,11 +446,29 @@ sub addrangedetection {
my $trange;
my $begin;
my $end;
$netcfgs{$net->{net}}->{nameservers} = $net->{nameservers};
# convert <xcatmaster> to nameserver IP
if ($net->{nameservers} eq '<xcatmaster>')
{
$netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
}
else
{
$netcfgs{$net->{net}}->{nameservers} = $net->{nameservers};
}
$netcfgs{$net->{net}}->{ddnsdomain} = $net->{ddnsdomain};
$netcfgs{$net->{net}}->{domain} = $domain; #TODO: finer grained domains
unless ($netcfgs{$net->{net}}->{nameservers}) {
$netcfgs{$net->{net}}->{nameservers} = $::XCATSITEVALS{nameservers};
# convert <xcatmaster> to nameserver IP
if ($::XCATSITEVALS{nameservers} eq '<xcatmaster>')
{
$netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
}
else
{
$netcfgs{$net->{net}}->{nameservers} = $::XCATSITEVALS{nameservers};
}
}
foreach $trange (split /;/,$tranges) {
if ($trange =~ /[ ,-]/) { #a range of one number to another..
@@ -790,7 +808,15 @@ sub process_request
}
($href) = $sitetab->getAttribs({key => 'nameservers'}, 'value');
if ($href and $href->{value}) {
$sitenameservers = $href->{value};
# convert <xcatmaster> to nameserver IP
if ($href->{value} eq '<xcatmaster>')
{
$sitenameservers = xCAT::InstUtils->convert_xcatmaster();
}
else
{
$sitenameservers = $href->{value};
}
}
($href) = $sitetab->getAttribs({key => 'ntpservers'}, 'value');
if ($href and $href->{value}) {
@@ -1502,7 +1528,15 @@ sub addnet
}
if ($ent and $ent->{nameservers})
{
$nameservers = $ent->{nameservers};
# convert <xcatmaster> to nameserver IP
if ($ent->{nameservers} eq '<xcatmaster>')
{
$nameservers = xCAT::InstUtils->convert_xcatmaster();
}
else
{
$nameservers = $ent->{nameservers};
}
}
else
{