From 5a96c881efac1fc167865dae06479ff1f550dac0 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 3 Mar 2010 14:24:27 +0000 Subject: [PATCH] -Restore service pool dynamic load balancing behavior, I think git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5351 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 +- xCAT-server/lib/xcat/plugins/sles.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index c76cb0ff7..bbed98d68 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -361,7 +361,7 @@ sub mknetboot { $xcatmaster = $ient->{xcatmaster}; } else { - $callback->({error=>"Error: xcatmaster for $node is not set!\nPlease check the noderes table",errorcode=>[1]}); + $xcatmaster = '!myipfn!'; #allow service nodes to dynamically nominate themselves as a good contact point, this is of limited use in the event that xcat is not the dhcp/tftp server } if ($ient and $ient->{tftpserver}) diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index f27aaae07..310339859 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -236,7 +236,7 @@ sub mknetboot { $xcatmaster = $ient->{xcatmaster}; } else { - $callbck->({error=>"Error: xcatmaster for $node is not set!\nPlease check the noderes table",errorcode=>[1]}); + $xcatmaster = '!myipfn!'; #allow service nodes to dynamically nominate themselves as a good contact point, this is of limited use in the event that xcat is not the dhcp/tftp server } $ient = $restab->getNodeAttribs($node, ['tftpserver']);