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

-Fix mkvm of new node failing to create a SCSI controller if required (induced by changes to implement chvm)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6383 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-06-08 13:22:33 +00:00
parent ad1c0fcfb3
commit c153c74d36
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1736,7 +1736,9 @@ sub create_storage_devs {
my $disktype = 'ide';
my $ideunitnum=0;
my $scsiunitnum=0;
my $havescsicontroller=0;
if (defined $existingScsiCont) {
$havescsicontroller=1;
$scsicontrollerkey = $existingScsiCont->{key};
$scsiunitnum = $scsiUnit;
}
@ -1803,17 +1805,17 @@ sub create_storage_devs {
}
#It *seems* that IDE controllers are not subject to require creation, so we skip it
# if ($havescsidevs) { #need controllers to attach the disks to
# foreach(0..$scsicontrollerkey) {
# $dev=VirtualLsiLogicController->new(key => $_,
# device => \@{$disktocont{$_}},
# sharedBus => VirtualSCSISharing->new('noSharing'),
# busNumber => $_);
# push @devs,VirtualDeviceConfigSpec->new(device => $dev,
# operation => VirtualDeviceConfigSpecOperation->new('add'));
#
# }
# }
if ($havescsidevs and not $havescsicontroller) { #need controllers to attach the disks to
foreach(0..$scsicontrollerkey) {
$dev=VirtualLsiLogicController->new(key => $_,
device => \@{$disktocont{$_}},
sharedBus => VirtualSCSISharing->new('noSharing'),
busNumber => $_);
push @devs,VirtualDeviceConfigSpec->new(device => $dev,
operation => VirtualDeviceConfigSpecOperation->new('add'));
}
}
return @devs;
# my $ctlr = VirtualIDEController->new(
}