xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

change networks.gateway value <myself> to <xcatmaster>

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9120 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc
2011-03-22 02:22:58 +00:00
parent 01ccf9e3f8
commit cfb3c68892
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/DBobjUtils.pm
View File

@@ -1938,7 +1938,7 @@ sub getNetwkInfo
$nethash{$node}{$attr} = $_->{$attr};
}
}
if($nethash{$node}{'gateway'} eq '<myself>')
if($nethash{$node}{'gateway'} eq '<xcatmaster>')
{
if(xCAT::NetworkUtils->ip_forwarding_enabled())
{

2
perl-xCAT/xCAT/Schema.pm
View File

@@ -433,7 +433,7 @@ networks => {
net => 'The network address.',
mask => 'The network mask.',
mgtifname => 'The interface name of the management/service node facing this network. !remote! indicates a non-local network for relay DHCP.',
gateway => 'The network gateway. It can be set to an ip address or the keyword <myself>, the keyword <myself> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.',
gateway => 'The network gateway. It can be set to an ip address or the keyword <xcatmaster>, the keyword <xcatmaster> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.',
dhcpserver => 'The DHCP server that is servicing this network. Required to be explicitly set for pooled service node operation.',
tftpserver => 'The TFTP server that is servicing this network. If not set, the DHCP server is assumed.',
nameservers => 'The nameservers for this network. Used in creating the DHCP network definition, and DNS configuration.',

2
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@@ -880,7 +880,7 @@ sub net_parms
my $net = $_->{'net'};
my $mask = $_->{'mask'};
my $gw = $_->{'gateway'};
if($gw eq '<myself>')
if($gw eq '<xcatmaster>')
{
if(xCAT::NetworkUtils->ip_forwarding_enabled())
{

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

@@ -1533,7 +1533,7 @@ sub addnet
{
$gateway = $ent->{gateway};
if ($gateway eq '<myself>')
if ($gateway eq '<xcatmaster>')
{
if(xCAT::NetworkUtils->ip_forwarding_enabled())
{
@@ -1719,7 +1719,7 @@ sub gen_aix_net
my @netent = ( "network $net $mask\n{\n");
if ( $gateway)
{
if ($gateway eq '<myself>')
if ($gateway eq '<xcatmaster>')
{
if(xCAT::NetworkUtils->ip_forwarding_enabled())
{

4
xCAT-server/lib/xcat/plugins/networks.pm
View File

@@ -284,12 +284,12 @@ sub donets
}
}
# set gateway to keyword <myself>,
# set gateway to keyword <xcatmaster>,
# to indicate to use the cluster-facing ip address
# on this management node or service node
if (!$gateway)
{
$gateway = "<myself>";
$gateway = "<xcatmaster>";
}