From 5a3718f088848f8fbf0c80d6ee914b0bddbc1f99 Mon Sep 17 00:00:00 2001
From: Julien Semaan <jul.semaan@gmail.com>
Date: Thu, 27 Jan 2022 10:25:56 -0500
Subject: [PATCH 1/3] allow to centralize the VIPs on the first node of the
 cluster

---
 conf/documentation.conf               |  7 +++++++
 conf/pf.conf.defaults                 |  6 ++++++
 lib/pf/services/manager/keepalived.pm | 13 ++++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/conf/documentation.conf b/conf/documentation.conf
index 20564189d9f5..f2261d26d610 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -1558,6 +1558,13 @@ description=<<EOT
 Defines the MariaDB password for Galera replication
 EOT
 
+[active_active.centralize_vips]
+type=toggle
+options=enabled|disabled
+description=<<EOT
+Centralize the virtual IP addresses on the same node instead of distributing them on the two first nodes of the cluster
+EOT
+
 [parking]
 guide_anchor=_parked_devices
 
diff --git a/conf/pf.conf.defaults b/conf/pf.conf.defaults
index bdd8eca00517..156933eefe86 100644
--- a/conf/pf.conf.defaults
+++ b/conf/pf.conf.defaults
@@ -1157,6 +1157,12 @@ galera_replication_username=
 #
 # Defines the replication password to be used for the MariaDB Galera cluster replication
 galera_replication_password=
+#
+# active_active.centralize_vips
+#
+# Centralize the virtual IP addresses on the same node instead of distributing them on the two first nodes of the cluster
+centralize_vips=disabled
+
 
 [parking]
 #
diff --git a/lib/pf/services/manager/keepalived.pm b/lib/pf/services/manager/keepalived.pm
index 5a8f951e78fa..9aee2ff3dd0d 100644
--- a/lib/pf/services/manager/keepalived.pm
+++ b/lib/pf/services/manager/keepalived.pm
@@ -104,11 +104,14 @@ EOT
         foreach my $interface ( @ints ) {
             my $cfg = $Config{"interface $interface"};
             next unless $cfg;
-            my $priority = 100 - pf::cluster::reg_cluster_index();
-            my $process_tracking = "haproxy_portal";
-            if ($Config{"interface $interface"}{'type'} =~ /management/i || $Config{"interface $interface"}{'type'} =~ /radius/i) {
-                $process_tracking = "radius_load_balancer";
-                $priority = 100 - pf::cluster::cluster_index();
+            my $priority = 100 - pf::cluster::cluster_index();
+            if(isdisabled($Config{active_active}{centralize_vips})) {
+                $priority = 100 - pf::cluster::reg_cluster_index();
+                my $process_tracking = "haproxy_portal";
+                if ($Config{"interface $interface"}{'type'} =~ /management/i || $Config{"interface $interface"}{'type'} =~ /radius/i) {
+                    $process_tracking = "radius_load_balancer";
+                    $priority = 100 - pf::cluster::cluster_index();
+                }
             }
             my $cluster_ip = pf::cluster::cluster_ip($interface);
             $tags{'vrrp'} .= <<"EOT";

From 981f735e98332dfb9fa1a399ad1c3d7815434670 Mon Sep 17 00:00:00 2001
From: Julien Semaan <jul.semaan@gmail.com>
Date: Thu, 27 Jan 2022 10:31:43 -0500
Subject: [PATCH 2/3] adjust logic of VIP centralizaiton

---
 lib/pf/services/manager/keepalived.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/pf/services/manager/keepalived.pm b/lib/pf/services/manager/keepalived.pm
index 9aee2ff3dd0d..29882418a08c 100644
--- a/lib/pf/services/manager/keepalived.pm
+++ b/lib/pf/services/manager/keepalived.pm
@@ -107,11 +107,10 @@ EOT
             my $priority = 100 - pf::cluster::cluster_index();
             if(isdisabled($Config{active_active}{centralize_vips})) {
                 $priority = 100 - pf::cluster::reg_cluster_index();
-                my $process_tracking = "haproxy_portal";
-                if ($Config{"interface $interface"}{'type'} =~ /management/i || $Config{"interface $interface"}{'type'} =~ /radius/i) {
-                    $process_tracking = "radius_load_balancer";
-                    $priority = 100 - pf::cluster::cluster_index();
-                }
+            }
+            my $process_tracking = "haproxy_portal";
+            if ($Config{"interface $interface"}{'type'} =~ /management/i || $Config{"interface $interface"}{'type'} =~ /radius/i) {
+                $process_tracking = "radius_load_balancer";
             }
             my $cluster_ip = pf::cluster::cluster_ip($interface);
             $tags{'vrrp'} .= <<"EOT";

From c877828fc97ce4adb07fbb6c1c0f8ee9a9ed8afd Mon Sep 17 00:00:00 2001
From: Julien Semaan <jul.semaan@gmail.com>
Date: Thu, 27 Jan 2022 11:16:46 -0500
Subject: [PATCH 3/3] add active_active.centralize_vips to admin

---
 .../Configuration/activeActive/_components/TheForm.vue     | 7 +++++++
 .../views/Configuration/activeActive/_components/index.js  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/html/pfappserver/root/src/views/Configuration/activeActive/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/activeActive/_components/TheForm.vue
index c062720907d6..3a5699a1e4eb 100644
--- a/html/pfappserver/root/src/views/Configuration/activeActive/_components/TheForm.vue
+++ b/html/pfappserver/root/src/views/Configuration/activeActive/_components/TheForm.vue
@@ -30,6 +30,11 @@
       :text="$i18n.t('Set the gateway option in DHCP replies to point only to the VIP in cluster mode rather than to all servers in the cluster.')"
     />
 
+    <form-group-centralize-vips namespace="centralize_vips"
+      :column-label="$i18n.t('Centralized virtual IPs')"
+      :text="$i18n.t('Centralize the virtual IP addresses on the same node instead of distributing them on the two first nodes of the cluster.')"
+    />
+
     <form-group-centralized-deauth namespace="centralized_deauth"
       :column-label="$i18n.t('Centralized access reevaluation')"
       :text="$i18n.t('Centralize the deauthentication to the management node of the cluster.')"
@@ -70,6 +75,7 @@ import schemaFn from '../schema'
 import {
   FormGroupAuthOnManagement,
   FormGroupCentralizedDeauth,
+  FormGroupCentralizeVips,
   FormGroupConflictResolutionThreshold,
   FormGroupDnsOnVipOnly,
   FormGroupGatewayOnVipOnly,
@@ -86,6 +92,7 @@ const components = {
 
   FormGroupAuthOnManagement,
   FormGroupCentralizedDeauth,
+  FormGroupCentralizeVips,
   FormGroupConflictResolutionThreshold,
   FormGroupDnsOnVipOnly,
   FormGroupGatewayOnVipOnly,
diff --git a/html/pfappserver/root/src/views/Configuration/activeActive/_components/index.js b/html/pfappserver/root/src/views/Configuration/activeActive/_components/index.js
index 08e8f03bbf1e..d6df32dc2574 100644
--- a/html/pfappserver/root/src/views/Configuration/activeActive/_components/index.js
+++ b/html/pfappserver/root/src/views/Configuration/activeActive/_components/index.js
@@ -16,6 +16,7 @@ export {
 
   BaseFormGroupToggleDisabledEnabled  as FormGroupAuthOnManagement,
   BaseFormGroupToggleDisabledEnabled  as FormGroupCentralizedDeauth,
+  BaseFormGroupToggleDisabledEnabled  as FormGroupCentralizeVips,
   BaseFormGroupIntervalUnit           as FormGroupConflictResolutionThreshold,
   BaseFormGroupToggleDisabledEnabled  as FormGroupDnsOnVipOnly,
   BaseFormGroupToggleDisabledEnabled  as FormGroupGatewayOnVipOnly,