diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-05-14 21:26:01 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-05-14 21:39:46 +0200 |
| commit | cd59f198366ce58a01887e4f900a746d5b10b161 (patch) | |
| tree | 74067c6bc61b6f888f53194e002ed7ed3613d570 | |
| parent | 26210f3465dac5edac18c7b7c1cda18531a7483e (diff) | |
| download | vyos-1x-cd59f198366ce58a01887e4f900a746d5b10b161.tar.gz vyos-1x-cd59f198366ce58a01887e4f900a746d5b10b161.zip | |
conntrack: T3535: remove cluster CLI nodes
| -rw-r--r-- | interface-definitions/service_conntrack-sync.xml.in | 12 | ||||
| -rwxr-xr-x | 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()) |