summaryrefslogtreecommitdiff
path: root/src/migration-scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-06-09 21:44:03 +0200
committerChristian Breunig <christian@breunig.cc>2026-06-09 21:44:03 +0200
commitba60d0c0c2fb56ce739653c0728bf836a8740184 (patch)
tree21705b7ad59a8b8795d979cf37cf05c12b8942bc /src/migration-scripts
parent6a5f1961cde6116457cb9e6b958bee7b66603c3b (diff)
downloadvyos-1x-ba60d0c0c2fb56ce739653c0728bf836a8740184.tar.gz
vyos-1x-ba60d0c0c2fb56ce739653c0728bf836a8740184.zip
salt: T8973: remove feature
As salt has been marked deprecated via T8056 and is thus deprecated in VyOS 1.5 and VyOS 1.4 it is time to remove it from the rolling release.
Diffstat (limited to 'src/migration-scripts')
-rw-r--r--src/migration-scripts/system/32-to-33 (renamed from src/migration-scripts/salt/0-to-1)18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/migration-scripts/salt/0-to-1 b/src/migration-scripts/system/32-to-33
index 05f6476ce..632be0dae 100644
--- a/src/migration-scripts/salt/0-to-1
+++ b/src/migration-scripts/system/32-to-33
@@ -1,4 +1,4 @@
-# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright (C) VyOS Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -13,26 +13,12 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-# Delete log_file, log_level and user nodes
-# rename hash_type to hash
-# rename mine_interval to interval
-
from vyos.configtree import ConfigTree
base = ['service', 'salt-minion']
def migrate(config: ConfigTree) -> None:
if not config.exists(base):
- # Nothing to do
return
- # delete nodes which are now populated with sane defaults
- for node in ['log_file', 'log_level', 'user']:
- if config.exists(base + [node]):
- config.delete(base + [node])
-
- if config.exists(base + ['hash_type']):
- config.rename(base + ['hash_type'], 'hash')
-
- if config.exists(base + ['mine_interval']):
- config.rename(base + ['mine_interval'], 'interval')
+ config.delete(base)