From cd59f198366ce58a01887e4f900a746d5b10b161 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 14 May 2021 21:26:01 +0200
Subject: conntrack: T3535: remove cluster CLI nodes

---
 interface-definitions/service_conntrack-sync.xml.in | 12 ------------
 src/migration-scripts/conntrack-sync/1-to-2         |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 45d211479..2953ae390 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -71,18 +71,6 @@
               <help>Failover mechanism to use for conntrack-sync</help>
             </properties>
             <children>
-              <node name="cluster">
-                <properties>
-                  <help>Cluster as failover-mechanism to use for conntrack-sync</help>
-                </properties>
-                <children>
-                  <leafNode name="group">
-                    <properties>
-                      <help>Cluster group [DEPRECATED]</help>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
               <node name="vrrp">
                 <properties>
                   <help>VRRP as failover-mechanism to use for conntrack-sync</help>
diff --git a/src/migration-scripts/conntrack-sync/1-to-2 b/src/migration-scripts/conntrack-sync/1-to-2
index 3a76fc0e0..ebbd8c35a 100755
--- a/src/migration-scripts/conntrack-sync/1-to-2
+++ b/src/migration-scripts/conntrack-sync/1-to-2
@@ -53,6 +53,11 @@ else:
         for address in tmp:
             config.set(base + ['ignore-address'], value=address, replace=False)
 
+    # we no longer support cluster mode
+    base_cluster = base + ['failover-mechanism', 'cluster']
+    if config.exists(base_cluster):
+        config.delete(base_cluster)
+
     try:
         with open(file_name, 'w') as f:
             f.write(config.to_string())
-- 
cgit v1.2.3