From 31d979a273819d7897d3b0fec454ab9088f23a9d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 1 Oct 2009 21:01:03 +0000
Subject: [PATCH] -Restore direct mode operation, but remain defaulting to via
 vcenter if vcenter is in use

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4282 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 9adcacac6..640539a9a 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -272,7 +272,7 @@ sub process_request {
 	#my $children = 0;
     #my $vmmaxp = 84;
 	#$SIG{CHLD} = sub { my $cpid; while ($cpid = waitpid(-1, WNOHANG) > 0) { delete $esx_comm_pids{$cpid}; $children--; } };
-    my $viavcenter = 1;
+    my $viavcenter = 0;
     if ($command eq 'rmigrate') { #Only use vcenter when required, fewer prereqs
         $viavcenter = 1;
     }
@@ -283,7 +283,7 @@ sub process_request {
     }
 	foreach my $hyp (sort(keys %hyphash)){
 		#if($pid == 0){
-        if ($viavcenter) {
+        if ($viavcenter or (defined $tablecfg{hypervisor}->{$hyp}->[0]->{mgr} and not $tablecfg{hypervisor}->{$hyp}->[0]->{preferdirect})) {
             $hypready{$hyp} = 0; #This hypervisor requires a flag be set to signify vCenter sanenes before proceeding
             $hyphash{$hyp}->{conn} = Vim->new(service_url=>"https://$hyp/sdk"); #Direct connect to install/check licenses
             $hyphash{$hyp}->{conn}->login(user_name=>$hyphash{$hyp}->{username},password=>$hyphash{$hyp}->{password});