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

Merge branch '2.8' of ssh://jjhua@git.code.sf.net/p/xcat/xcat-core into 2.8

Browse Source
This commit is contained in:
jjhua 2013-10-25 14:47:00 -04:00
commit 63573b4138
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT/xCAT/FSPvm.pm
View File

@ -1720,6 +1720,10 @@ sub remove {
my @result = ();
while (my ($mtms, $h) = each (%$hash)) {
while (my ($name, $d) = each (%$h)) {
if (@$d[4] ne "lpar") {
push @result, [$name, "Node must be LPAR", 1];
last;
}
&clear_service_authority_lpar($request, $name, $d);
my $values = &set_lpar_undefined($request, $name, $d);
push @result, $values;
@ -1878,6 +1882,10 @@ sub mkspeclpar {
my @nodes = keys(%$h);
my $ent = $vmtab->getNodesAttribs(\@nodes, ['cpus', 'memory','physlots', 'othersettings']);
while (my ($name, $d) = each (%$h)) {
if (@$d[4] ne 'lpar') {
push @result, [$name, "Node must be LPAR", 1];
last;
}
if (!exists($memhash->{run})) {
my @td = @$d;
@td[0] = 0;
@ -1954,6 +1962,10 @@ sub mkfulllpar {
while (my ($mtms, $h) = each (%$hash)) {
my $rethash;
while (my ($name, $d) = each (%$h)) {
if (@$d[4] ne 'lpar') {
push @result, [$name, "Node must be LPAR", 1];
last;
}
if (!exists($rethash->{run})) {
my @td = @$d;
@td[0] = 0;