saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make salt-ssh respect --wipe again

Browse source
This commit is contained in:
jeanluc 2022-11-08 04:30:11 +01:00 • committed by Megan Wilhite
parent 7e225f281e
commit 1e54e400d4
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/61083.fixed Normal file
View file

@ -0,0 +1 @@
Made salt-ssh respect --wipe again

7
salt/client/ssh/__init__.py
View file

@ -1205,6 +1205,13 @@ class Single:
opts["grains"][grain] = self.target["grains"][grain] opts["grains"][grain] = self.target["grains"][grain]
opts["pillar"] = data.get("pillar") opts["pillar"] = data.get("pillar")
# Restore --wipe. Note: Since it is also a CLI option, it should not
# be read from cache, hence it is restored here. This is currently only
# of semantic distinction since data_cache has been disabled, so refresh
# above always evaluates to True. TODO: cleanup?
opts["ssh_wipe"] = self.opts.get("ssh_wipe", False)
wrapper = salt.client.ssh.wrapper.FunctionWrapper( wrapper = salt.client.ssh.wrapper.FunctionWrapper(
opts, opts,
self.id, self.id,