From ba60d0c0c2fb56ce739653c0728bf836a8740184 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 9 Jun 2026 21:44:03 +0200 Subject: 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. --- src/migration-scripts/salt/0-to-1 | 38 ----------------------------------- src/migration-scripts/system/32-to-33 | 24 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 src/migration-scripts/salt/0-to-1 create mode 100644 src/migration-scripts/system/32-to-33 (limited to 'src/migration-scripts') diff --git a/src/migration-scripts/salt/0-to-1 b/src/migration-scripts/salt/0-to-1 deleted file mode 100644 index 05f6476ce..000000000 --- a/src/migration-scripts/salt/0-to-1 +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright VyOS maintainers and contributors -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this library. If not, see . - -# 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') diff --git a/src/migration-scripts/system/32-to-33 b/src/migration-scripts/system/32-to-33 new file mode 100644 index 000000000..632be0dae --- /dev/null +++ b/src/migration-scripts/system/32-to-33 @@ -0,0 +1,24 @@ +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library. If not, see . + +from vyos.configtree import ConfigTree + +base = ['service', 'salt-minion'] + +def migrate(config: ConfigTree) -> None: + if not config.exists(base): + return + + config.delete(base) -- cgit v1.2.3