Commit 334be328 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' of https://github.com/UPC/ravada into develop

parents 49a51f72 ca33df5e
......@@ -2423,10 +2423,11 @@ sub _do_execute_command {
$err =~ s/(.*?)retry.?/$1/i;
$request->error($err) if $err;
}
}
} else {
$request->status('done')
if $request->status() ne 'done'
&& $request->status() !~ /^retry/i;
}
}
sub _cmd_manage_pools($self, $request) {
......
......@@ -1373,7 +1373,7 @@ sub balance_vm($self, $base=undef) {
@vms = $self->list_nodes();
}
# warn Dumper([ map { $_->name } @vms]);
return $self if !@vms;
return $self if scalar(@vms)<2;
for my $vm (_random_list( @vms )) {
next if !$vm->enabled();
my $active = 0;
......
......@@ -673,6 +673,7 @@ sub create_volume {
my $file_xml = delete $args{xml} or confess "ERROR: Missing XML template";
my $size = delete $args{size};
$size = int($size) if defined $size;
my $swap =(delete $args{swap} or 0);
my $target = delete $args{target};
my $capacity = delete $args{capacity};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment