From 4753c86b3835b6050631827b7cee4c3e2214808d Mon Sep 17 00:00:00 2001 From: Lei Ai Date: Fri, 22 Aug 2014 17:01:54 +0800 Subject: [PATCH] merge fix from 2.8 branch: clear currchain while regen chain --- xCAT-server/lib/xcat/plugins/profilednodes.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm index 06bcccf2c..c8ab55cec 100644 --- a/xCAT-server/lib/xcat/plugins/profilednodes.pm +++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm @@ -933,6 +933,7 @@ Usage: my %chainAttr = {}; foreach my $node (@$nodes){ $chainAttr{$node}{'chain'} = $chainstr; + $chainAttr{$node}{'currchain'} = ''; } my $chaintab = xCAT::Table->new('chain', -create=>1); $chaintab->setNodesAttribs(\%chainAttr); @@ -1124,8 +1125,9 @@ Usage: $fsp_flag = 1; $fspipsAttr{$node}{"hcp"} = $nextip; } - } + } } + # Add reserve nics foreach my $nicname (@reserveNics){ my $oldip = $nodesNicsRef->{$node}->{$nicname}->{"ip"}; @@ -1323,7 +1325,7 @@ Usage: # DB update: chain table. my $chaintab = xCAT::Table->new('chain', -create=>1); - $mactab->setNodeAttribs($hostname, {chain=>$chainstr}); + $chaintab->setNodeAttribs($hostname, {chain=>$chainstr, currchain=>''}); $chaintab->close();