xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

Based on Er Tao's comments, before going into the code for determining

Browse Source 
the noboot nic names, parse out the interface names for the tagged vlans
without the physical name in the string
This commit is contained in:
Victor Hu 2016-11-15 16:43:09 -05:00
parent 2ca61ad9e8
commit 263acbf5ce
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,28 +73,20 @@ sub process_request {
}
}
my $nicips = xCAT::NetworkUtils->get_nic_ip();
foreach (keys $nicips) {
# To support tagged vlan, create entries in the hash for the
# interface name removing the physical interface ending:
# 'enP1p12s0f0.2@enP1p12s0f0' => 'enP1p12s0f0.2'
if ($_ =~ "@") {
my $newkey = $_;
$newkey =~ s/\@.*//g;
$$nicips{$newkey} = ${nicips}->{$_};
}
}
foreach (keys %nobootnics) {
# looping on each nics that has 'noboot' configured
print "DEBUG ==> Interface $_ is set to 'noboot'\n";
if (defined($nicips)) {
foreach my $nicipkey (keys $nicips) {
if ( $nicipkey =~ "@" ) {
# If VLAN tagging is in use on this management node, the interface name is taken
# from 'ip addr show' command and will contain the physical interface:
# enP1p12s0f0.2@enP1p12s0f0
if ($nicipkey =~ m/$_\@/i ) {
print "DEBUG ---- FOUND ---- Interface name $_ is part of $nicipkey, IP=$nicips->{$nicipkey}!\n";
if (defined($nicips->{$nicipkey})) {
$nobootnicips{$nicips->{$nicipkey}} = 1;
}
}
} else {
# Non VLAN case
if (defined($nicips->{$_})) {
$nobootnicips{$nicips->{$_}} = 1;
}
}
}
if (defined($nicips->{$_})) {
$nobootnicips{$nicips->{$_}} = 1;
}
}
}