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

-Move license validation to only occur if not already in vCenter

Browse Source 
-Avoid direct connection if vCenter not in use


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4559 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-11-12 22:04:38 +00:00
parent d72e05af69
commit 4cd6b3fffb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,9 +288,6 @@ sub process_request {
if ($viavcenter or (defined $tablecfg{hypervisor}->{$hyp}->[0]->{mgr} and not $tablecfg{hypervisor}->{$hyp}->[0]->{preferdirect})) {
$viavcenter=1;
$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});
validate_licenses($hyp);
my $vcenter = $hyphash{$hyp}->{vcenter}->{name};
unless ($vcenterhash{$vcenter}->{conn}) {
$vcenterhash{$vcenter}->{conn} =
@ -1412,6 +1409,9 @@ sub validate_vcenter_prereqs { #Communicate with vCenter and ensure this host is
}
}
#If still in function, haven't found any likely host entries, make a new one
$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});
validate_licenses($hyp);
addhosttovcenter(undef,{
depfun => $depfun,
depargs => $depargs,