diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-06-09 21:44:03 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-06-09 21:44:03 +0200 |
| commit | ba60d0c0c2fb56ce739653c0728bf836a8740184 (patch) | |
| tree | 21705b7ad59a8b8795d979cf37cf05c12b8942bc /interface-definitions | |
| parent | 6a5f1961cde6116457cb9e6b958bee7b66603c3b (diff) | |
| download | vyos-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 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/salt-version.xml.i | 3 | ||||
| -rw-r--r-- | interface-definitions/include/version/system-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/service_salt-minion.xml.in | 74 |
3 files changed, 1 insertions, 78 deletions
diff --git a/interface-definitions/include/version/salt-version.xml.i b/interface-definitions/include/version/salt-version.xml.i deleted file mode 100644 index fe4684050..000000000 --- a/interface-definitions/include/version/salt-version.xml.i +++ /dev/null @@ -1,3 +0,0 @@ -<!-- include start from include/version/salt-version.xml.i --> -<syntaxVersion component='salt' version='1'></syntaxVersion> -<!-- include end --> diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i index f29226c03..58bba16a2 100644 --- a/interface-definitions/include/version/system-version.xml.i +++ b/interface-definitions/include/version/system-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/system-version.xml.i --> -<syntaxVersion component='system' version='32'></syntaxVersion> +<syntaxVersion component='system' version='33'></syntaxVersion> <!-- include end --> diff --git a/interface-definitions/service_salt-minion.xml.in b/interface-definitions/service_salt-minion.xml.in deleted file mode 100644 index eaa2899f4..000000000 --- a/interface-definitions/service_salt-minion.xml.in +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="service"> - <children> - <node name="salt-minion" owner="${vyos_conf_scripts_dir}/service_salt-minion.py"> - <properties> - <help>Salt Minion</help> - <priority>500</priority> - </properties> - <children> - <leafNode name="hash"> - <properties> - <help>Hash used when discovering file on master server (default: sha256)</help> - <completionHelp> - <list>md5 sha1 sha224 sha256 sha384 sha512</list> - </completionHelp> - <constraint> - <regex>(md5|sha1|sha224|sha256|sha384|sha512)</regex> - </constraint> - </properties> - <defaultValue>sha256</defaultValue> - </leafNode> - <leafNode name="master"> - <properties> - <help>Hostname or IP address of the Salt master server</help> - <valueHelp> - <format>ipv4</format> - <description>Salt server IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>Salt server IPv6 address</description> - </valueHelp> - <valueHelp> - <format>hostname</format> - <description>Salt server FQDN address</description> - </valueHelp> - <constraint> - <validator name="ip-address"/> - <validator name="fqdn"/> - </constraint> - <constraintErrorMessage>Invalid FQDN or IP address</constraintErrorMessage> - <multi/> - </properties> - </leafNode> - <leafNode name="id"> - <properties> - <help>Explicitly declare ID for this minion to use (default: hostname)</help> - </properties> - </leafNode> - <leafNode name="interval"> - <properties> - <help>Interval in minutes between updates (default: 60)</help> - <valueHelp> - <format>u32:1-1440</format> - <description>Update interval in minutes</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-1440"/> - </constraint> - </properties> - <defaultValue>60</defaultValue> - </leafNode> - <leafNode name="master-key"> - <properties> - <help>URL with signature of master for auth reply verification</help> - </properties> - </leafNode> - #include <include/source-interface.xml.i> - </children> - </node> - </children> - </node> -</interfaceDefinition> |
