diff --git a/changelog/63208.fixed b/changelog/63208.fixed new file mode 100644 index 00000000000..e8ee88a7b1a --- /dev/null +++ b/changelog/63208.fixed @@ -0,0 +1 @@ +Made pillar cache pass extra minion data as well diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py index 470b4f97af8..5a3f5388b40 100644 --- a/salt/pillar/__init__.py +++ b/salt/pillar/__init__.py @@ -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()