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

Convert the <xcatmaster> keyword to SN's interface as known by compute node.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9790 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sjing 2011-06-13 03:58:36 +00:00
parent 469d4b2e34
commit d977ef6b32
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,11 +448,13 @@ sub addrangedetection {
my $trange;
my $begin;
my $end;
my $myip;
$myip = xCAT::Utils->my_ip_facing($net->{net});
# convert <xcatmaster> to nameserver IP
if ($net->{nameservers} eq '<xcatmaster>')
{
$netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
$netcfgs{$net->{net}}->{nameservers} = $myip;
}
else
{
@ -465,7 +467,7 @@ sub addrangedetection {
# convert <xcatmaster> to nameserver IP
if ($::XCATSITEVALS{nameservers} eq '<xcatmaster>')
{
$netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
$netcfgs{$net->{net}}->{nameservers} = $myip;
}
else
{
@ -840,15 +842,7 @@ sub process_request
}
($href) = $sitetab->getAttribs({key => 'nameservers'}, 'value');
if ($href and $href->{value}) {
# convert <xcatmaster> to nameserver IP
if ($href->{value} eq '<xcatmaster>')
{
$sitenameservers = xCAT::InstUtils->convert_xcatmaster();
}
else
{
$sitenameservers = $href->{value};
}
$sitenameservers = $href->{value};
}
($href) = $sitetab->getAttribs({key => 'ntpservers'}, 'value');
if ($href and $href->{value}) {
@ -1620,6 +1614,13 @@ sub addnet
);
}
}
# convert <xcatmaster> to nameserver IP
if ($nameservers eq '<xcatmaster>')
{
$nameservers = $myip;
}
$nameservers=putmyselffirst($nameservers);
$ntpservers=putmyselffirst($ntpservers);
$logservers=putmyselffirst($logservers);