partially revert previous unclean commit

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index f9e76d8575b0f7687ebdc8efb3b68d022ea3ab86..af4e21e3a36a6030dec13051f440f34347aba917 100644 (file)
--- 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 a0761adc1a23a634fa3245a3af37bde4a551a95b..7c373bcab0ce281cfab1ff5ee455ffa3a917c798 100644 (file)
--- 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',