Skip to content

Commit e165fdf

Browse files
authored
Merge pull request #5262 from c-po/remote-salt
salt: T8973: remove feature
2 parents f84a944 + ba60d0c commit e165fdf

9 files changed

Lines changed: 3 additions & 403 deletions

File tree

data/templates/salt-minion/minion.j2

Lines changed: 0 additions & 67 deletions
This file was deleted.

debian/control

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ Depends:
241241
openssh-server,
242242
sshguard,
243243
# End "service ssh"
244-
# For "service salt-minion"
245-
salt-minion,
246-
# End "service salt-minion"
247244
# For "service snmp"
248245
snmp,
249246
snmpd,

debian/vyos-1x.postinst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
# Turn off Debian default for %sudo
44
sed -i -e '/^%sudo/d' /etc/sudoers || true
55

6-
# Add minion user for salt-minion
7-
if ! grep -q '^minion' /etc/passwd; then
8-
adduser --quiet --firstuid 100 --system --disabled-login --ingroup vyattacfg \
9-
--gecos "salt minion user" --shell /bin/vbash minion
10-
adduser --quiet minion frrvty
11-
adduser --quiet minion sudo
12-
adduser --quiet minion adm
13-
adduser --quiet minion dip
14-
adduser --quiet minion disk
15-
adduser --quiet minion users
16-
adduser --quiet minion frr
17-
fi
18-
196
# OpenVPN should get its own user
207
if ! grep -q '^openvpn' /etc/passwd; then
218
adduser --quiet --firstuid 100 --system --group --shell /usr/sbin/nologin openvpn

interface-definitions/include/version/salt-version.xml.i

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<!-- include start from include/version/system-version.xml.i -->
2-
<syntaxVersion component='system' version='32'></syntaxVersion>
2+
<syntaxVersion component='system' version='33'></syntaxVersion>
33
<!-- include end -->

interface-definitions/service_salt-minion.xml.in

Lines changed: 0 additions & 74 deletions
This file was deleted.

smoketest/scripts/cli/test_service_salt-minion.py

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)