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

-Fix vm.host corruption when hostnames != nodenames

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5202 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-02-09 16:26:40 +00:00
parent 1fcbdfcbb2
commit fbcd0b6645
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,7 +321,7 @@ sub process_request {
};
if ($@) {
$vcenterhash{$vcenter}->{conn} = undef;
sendmsg([1,"Unable to reach $vcenter vCenter server to manage $hyp"]);
sendmsg([1,"Unable to reach $vcenter vCenter server to manage $hyp: $@"]);
next;
}
}
@@ -966,6 +966,9 @@ sub generic_vm_operation { #The general form of firing per-vm requests to ESX hy
my $host = $hyphash{$hyp}->{conn}->get_view(mo_ref=>$_->{'runtime.host'});
$host = $host->summary->config->name;
if ( $tablecfg{vm}->{$node}->[0]->{host} eq "$host" ) { next; }
my $newnhost = inet_aton($host);
my $oldnhost = inet_aton($tablecfg{vm}->{$node}->[0]->{host});
if ($newnhost = $oldnhost) { next; } #it resolved fine
my $shost = $host;
$shost =~ s/\..*//;
if ( $tablecfg{vm}->{$node}->[0]->{host} eq "$shost" ) { next; }
@@ -978,9 +981,9 @@ sub generic_vm_operation { #The general form of firing per-vm requests to ESX hy
if ($nodes[0]) {
print $node. " and ".$nodes[0];
$vmtab->setNodeAttribs($node,{host=>$nodes[0]});
} else {
$vmtab->setNodeAttribs($node,{host=>$host});
}
} #else {
# $vmtab->setNodeAttribs($node,{host=>$host});
#}
}
}