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

-Cleanup mistakes in recent vmware plugin work

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8044 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-11-04 18:13:35 +00:00
parent 8d9dd3441e
commit 88dfaba62a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,7 @@ sub process_request {
if ($ref and $ref->{value}) {
$usehostnamesforvcenter = $ref->{value};
}
(my $ref) = $sitetab->getAttribs({key => 'vcenterautoconnect'}, 'value');
($ref) = $sitetab->getAttribs({key => 'vcenterautoconnect'}, 'value');
if ($ref and $ref->{value}) {
$vcenterautoconnect = $ref->{value};
if ($vcenterautoconnect =~ /^n/ or $vcenterautoconnect =~ /^dis/) {
@ -2811,11 +2811,10 @@ sub validate_vcenter_prereqs { #Communicate with vCenter and ensure this host is
}
}
}
unless ($vcenterautojoin) {
unless ($vcenterautoconnect) {
xCAT::SvrUtils::sendmsg([1,": Failed to communicate with $hyp, vCenter does not have it in inventory and xCAT is set to not autojoin"], $output_handler);
$hyphash{$hyp}->{conn} = undef;
return "failed";
}
}
#If still in function, haven't found any likely host entries, make a new one
unless ($hyphash{$hyp}->{offline}) {