Allow migrate-all button on HA enabled VMs

Signed-off-by: Caspar Smit <casparsmit@supernas.eu>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Caspar Smit 2016-03-18 09:30:30 +01:00 committed by Dietmar Maurer
parent 6677f6402e
commit 92c11ee1ca

View File

@ -1208,9 +1208,6 @@ my $get_start_stop_list = sub {
$startup = { order => $bootorder };
}
# skip ha managed VMs (started by pve-ha-manager)
return if PVE::HA::Config::vm_is_ha_managed($vmid);
$resList->{$startup->{order}}->{$vmid} = $startup;
$resList->{$startup->{order}}->{$vmid}->{type} = $d->{type};
};
@ -1286,6 +1283,9 @@ __PACKAGE__->register_method ({
die "unknown VM type '$d->{type}'\n";
}
# skip ha managed VMs (started by pve-ha-manager)
next if PVE::HA::Config::vm_is_ha_managed($vmid);
PVE::Cluster::check_cfs_quorum(); # abort when we loose quorum
eval {
@ -1413,6 +1413,9 @@ __PACKAGE__->register_method ({
};
foreach my $vmid (sort {$b <=> $a} keys %$vmlist) {
# skip ha managed VMs (stopped by pve-ha-manager)
next if PVE::HA::Config::vm_is_ha_managed($vmid);
my $d = $vmlist->{$vmid};
my $upid;
eval { $upid = &$create_stop_worker($nodename, $d->{type}, $vmid, $d->{down}); };