Merge pull request #5262 from c-po/remote-salt

salt: T8973: remove feature

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)