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

-Remove some debug output

Browse Source 
-Implement mkvm for diskless guests


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3767 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-07-13 20:10:08 +00:00
parent 7d52f64508
commit a8bc224fb2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,7 @@ sub get_hostview {
$subargs{properties}=$args{properties};
}
foreach (@{$args{conn}->find_entity_views(%subargs)}) {
if ($_->name =~ /$host(?:\.\z)/ or $_->name =~ /localhost(?:\.|\z)/) {
if ($_->name =~ /$host(?:\.|\z)/ or $_->name =~ /localhost(?:\.|\z)/) {
return $_;
last;
}
@ -677,7 +677,6 @@ sub migrate {
sub reconfig_callback {
my $task = shift;
my $args = shift;
print Dumper($task->info);
#$args->{reconfig_args}->{vmview}->update_view_data();
delete $args->{reconfig_args}->{vmview}; #Force a reload of the view, update_view_data seems to not work as advertised..
$args->{reconfig_fun}->(%{$args->{reconfig_args}});
@ -1193,11 +1192,11 @@ sub build_cfgspec {
$currkey=0;
push @devices,create_storage_devs($node,$dses,$disksize);
push @devices,create_nic_devs($node,$netmap);
getcfgdatastore($node,$dses);
my $cfgdatastore = $tablecfg{vm}->{$node}->[0]->{storage}; #TODO: need a new cfglocation field in case of stateless guest?
$cfgdatastore =~ s/,.*$//;
$cfgdatastore =~ s/\/$//;
$cfgdatastore = "[".$dses->{$cfgdatastore}."]";
#my $cfgdatastore = $tablecfg{vm}->{$node}->[0]->{storage}; #TODO: need a new cfglocation field in case of stateless guest?
#$cfgdatastore =~ s/,.*$//;
#$cfgdatastore =~ s/\/$//;
#$cfgdatastore = "[".$dses->{$cfgdatastore}."]";
my $cfgdatastore = getcfgdatastore($node,$dses);
my $vfiles = VirtualMachineFileInfo->new(vmPathName=>$cfgdatastore);
#my $nodeos = $tablecfg{nodetype}->{$node}->[0]->{os};
#my $nodearch = $tablecfg{nodetype}->{$node}->[0]->{arch};
@ -1512,7 +1511,6 @@ sub validate_datastore_prereqs {
foreach $node (@$nodes) {
my @storage = split /,/,$tablecfg{vm}->{$node}->[0]->{storage};
push @storage,$tablecfg{vm}->{$node}->[0]->{cfgstore};
print Dumper($tablecfg{vm}->{$node});
foreach (@storage) {
s/\/$//; #Strip trailing slash if specified, to align to VMware semantics
if (/:\/\//) {