fix defect #4242 In physical rhel7 env,set installnic=ethx can not provision compute node.

This commit is contained in:
immarvin 2014-08-29 00:30:28 -07:00
parent a2907dc160
commit c176c37dad

View File

@ -1866,6 +1866,7 @@ sub getPostScripts
$result .= "setbootfromdisk\n";
}
#for redhat 7, append "disableconsistentNICrename" to default postscripts
#if "net.ifnames=0" is specified in kcmdline/addkcmdline of node or osimage
@ -1876,7 +1877,7 @@ sub getPostScripts
my $nrret = $::GLOBAL_TAB_HASH{noderes}{$node};
my $netboot = $nrret->{'netboot'};
if( ($os =~ "rhel7*") || ($os =~ "rhels7*") )
if( (($os =~ "rhel7*") || ($os =~ "rhels7*")) && ($nodesetstate) && ($nodesetstate eq "install") )
{
my $nodecfg;
if($netboot eq "grub2")