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

Fix state pillar recompilation

Browse source
This commit is contained in:
jeanluc 2023-10-31 11:46:36 +01:00 • committed by Pedro Algarvio
parent ec3a988390
commit 55f2e49637
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/client/ssh/state.py
View file

@ -68,6 +68,11 @@ class SSHState(salt.state.State):
# same as during regular operation.
popts.update(_opts)
popts.update(_opts.get("__master_opts__", {}))
# But, salt.state.State takes the parameters for get_pillar from
# the opts, so we need to ensure they are correct for the minion.
popts["id"] = _opts["id"]
popts["saltenv"] = _opts["saltenv"]
popts["pillarenv"] = _opts.get("pillarenv")
self.opts = popts
pillar = super()._gather_pillar()
self.opts = _opts