From: Thomas Lamprecht Date: Sat, 30 Mar 2019 18:21:03 +0000 (+0100) Subject: partially revert previous unclean commit X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=32ae610b9c13577d7237b994eda4057438b198c4;p=pve-ha-manager.git partially revert previous unclean commit Signed-off-by: Thomas Lamprecht --- diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm index f9e76d8..af4e21e 100644 --- a/src/PVE/HA/LRM.pm +++ b/src/PVE/HA/LRM.pm @@ -16,7 +16,6 @@ use PVE::HA::Resources; my $valid_states = { wait_for_agent_lock => "waiting for agent lock", active => "got agent_lock", - maintenance => "got agent_lock (maintenance)", lost_agent_lock => "lost agent_lock", }; @@ -279,8 +278,6 @@ sub work { my $ctime = $haenv->get_time(); - # FIXME: - if ($state eq 'wait_for_agent_lock') { my $service_count = $self->active_service_count(); diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm index a0761ad..7c373bc 100644 --- a/src/PVE/HA/Resources.pm +++ b/src/PVE/HA/Resources.pm @@ -72,13 +72,6 @@ EODESC default => 1, minimum => 0, }, - affinity => { - description => "How the groups member should be located to each other.", - type => 'string', - enum => ['none', 'separate', 'together'], - default => 'none', - optional => 1, - }, comment => { description => "Description.", type => 'string',