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

-Skip makedhcp on kvm and esx when dhcpsetup suggests it

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7896 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-10-20 18:41:08 +00:00
parent f5921d7852
commit 65c126eeed
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2142,7 +2142,9 @@ sub mkvms {
push @dhcpnodes,$_;
delete $tablecfg{dhcpneeded}->{$_};
}
$executerequest->({command=>['makedhcp'],node=>\@dhcpnodes});
unless ($::XCATSITEVALS{'dhcpsetup'} and ($::XCATSITEVALS{'dhcpsetup'} =~ /^n/i or $::XCATSITEVALS{'dhcpsetup'} =~ /^d/i or $::XCATSITEVALS{'dhcpsetup'} eq '0')) {
$executerequest->({command=>['makedhcp'],node=>\@dhcpnodes});
}
}
sub setboot {

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

@ -2255,7 +2255,9 @@ sub process_request {
push @dhcpnodes,$_;
delete $confdata->{dhcpneeded}->{$_};
}
$doreq->({command=>['makedhcp'],node=>\@dhcpnodes});
unless ($::XCATSITEVALS{'dhcpsetup'} and ($::XCATSITEVALS{'dhcpsetup'} =~ /^n/i or $::XCATSITEVALS{'dhcpsetup'} =~ /^d/i or $::XCATSITEVALS{'dhcpsetup'} eq '0')) {
$doreq->({command=>['makedhcp'],node=>\@dhcpnodes});
}
}
if ($command eq 'revacuate' or $command eq 'rmigrate') {