mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Make pillar cache pass extra minion data as well
This commit is contained in:
parent
938ac7db6e
commit
49c20ccff9
2 changed files with 4 additions and 0 deletions
1
changelog/63208.fixed
Normal file
1
changelog/63208.fixed
Normal file
|
@ -0,0 +1 @@
|
|||
Made pillar cache pass extra minion data as well
|
|
@ -81,6 +81,7 @@ def get_pillar(
|
|||
pillar_override=pillar_override,
|
||||
pillarenv=pillarenv,
|
||||
clean_cache=clean_cache,
|
||||
extra_minion_data=extra_minion_data,
|
||||
)
|
||||
return ptype(
|
||||
opts,
|
||||
|
@ -419,6 +420,7 @@ class PillarCache:
|
|||
self.pillar_override = pillar_override
|
||||
self.pillarenv = pillarenv
|
||||
self.clean_cache = clean_cache
|
||||
self.extra_minion_data = extra_minion_data
|
||||
|
||||
if saltenv is None:
|
||||
self.saltenv = "base"
|
||||
|
@ -455,6 +457,7 @@ class PillarCache:
|
|||
functions=self.functions,
|
||||
pillar_override=self.pillar_override,
|
||||
pillarenv=self.pillarenv,
|
||||
extra_minion_data=self.extra_minion_data,
|
||||
)
|
||||
return fresh_pillar.compile_pillar()
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue