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

add support for new nics table delimiter

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14852 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2013-01-10 20:04:21 +00:00
parent c0cd7d0e58
commit 1acc33adc1
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xCAT-server/lib/xcat/plugins/hosts.pm
View File

@@ -173,7 +173,12 @@ sub addotherinterfaces
my @itf_pairs = split(/,/, $otherinterfaces);
foreach (@itf_pairs)
{
my ($itf, $ip) = split(/:/, $_);
my ($itf, $ip);
if ($_ =~ /!/) {
($itf, $ip) = split(/!/, $_);
} else {
($itf, $ip) = split(/:/, $_);
}
if ($ip && xCAT::NetworkUtils->isIpaddr($ip))
{
if ($itf =~ /^-/)
@@ -447,23 +452,42 @@ sub donics
next;
}
# $et->{nicips} looks like "eth0:ip1,eth1:ip2,bmc:ip3..."
# delimiter could be ":" or "!"
# old $et->{nicips} looks like "eth0:ip1,eth1:ip2,bmc:ip3..."
# OR new $et->{nicips} looks like "eth0!ip1,eth1!ip2,bmc!ip3..."
my @nicandiplist = split(',', $et->{'nicips'});
foreach (@nicandiplist)
{
my ($nicname, $nicip) = split(':', $_);
my ($nicname, $nicip);
# if it contains a "!" then split on "!"
if ($_ =~ /!/) {
($nicname, $nicip) = split('!', $_);
} else {
($nicname, $nicip) = split(':', $_);
}
$nichash{$nicname}{nicip} = $nicip;
}
my @nicandsufx = split(',', $et->{'nichostnamesuffixes'});
foreach (@nicandsufx)
{
my ($nicname, $nicsufx) = split(':', $_);
my ($nicname, $nicsufx);
if ($_ =~ /!/) {
($nicname, $nicsufx) = split('!', $_);
} else {
($nicname, $nicsufx) = split(':', $_);
}
$nichash{$nicname}{nicsufx} = $nicsufx;
}
my @nicandnetwrk = split(',', $et->{'nicnetworks'});
foreach (@nicandnetwrk)
{
my ($nicname, $netwrk) = split(':', $_);
my ($nicname, $netwrk);
if ($_ =~ /!/) {
($nicname, $netwrk) = split('!', $_);
} else {
($nicname, $netwrk) = split(':', $_);
}
$nichash{$nicname}{netwrk} = $netwrk;
}