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 pillar cache pass extra minion data as well

Browse source
This commit is contained in:
jeanluc 2022-12-05 22:43:13 +01:00 • committed by Megan Wilhite
parent 938ac7db6e
commit 49c20ccff9
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/63208.fixed Normal file
View file

@ -0,0 +1 @@
Made pillar cache pass extra minion data as well

3
salt/pillar/__init__.py
View file

@ -81,6 +81,7 @@ def get_pillar(
pillar_override=pillar_override, pillar_override=pillar_override,
pillarenv=pillarenv, pillarenv=pillarenv,
clean_cache=clean_cache, clean_cache=clean_cache,
extra_minion_data=extra_minion_data,
) )
return ptype( return ptype(
opts, opts,
@ -419,6 +420,7 @@ class PillarCache:
self.pillar_override = pillar_override self.pillar_override = pillar_override
self.pillarenv = pillarenv self.pillarenv = pillarenv
self.clean_cache = clean_cache self.clean_cache = clean_cache
self.extra_minion_data = extra_minion_data
if saltenv is None: if saltenv is None:
self.saltenv = "base" self.saltenv = "base"
@ -455,6 +457,7 @@ class PillarCache:
functions=self.functions, functions=self.functions,
pillar_override=self.pillar_override, pillar_override=self.pillar_override,
pillarenv=self.pillarenv, pillarenv=self.pillarenv,
extra_minion_data=self.extra_minion_data,
) )
return fresh_pillar.compile_pillar() return fresh_pillar.compile_pillar()