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

Don't skip pillar compilation when master_type=='disable' (#37843)

Browse source 
This was broken in pull #32521. The community member who opened that PR
was apparently unaware of the fact that masterless minions will use the
Pillar instead of RemotePillar class, so skipping the Pillar compilation
here results in the packed pillar dunder being completely empty.

This PR fixes that by removing the check for master_type and allowing
local pillar data to be compiled.
This commit is contained in:
Erik Johnson 2016-11-23 10:43:01 -06:00 • committed by Nicole Thomas
parent 16ce844c54
commit 47d21d9ed2
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/minion.py
View file

@ -673,14 +673,13 @@ class SMinion(MinionBase):
'''
Load all of the modules for the minion
'''
if self.opts.get('master_type') != 'disable':
self.opts['pillar'] = salt.pillar.get_pillar(
self.opts,
self.opts['grains'],
self.opts['id'],
self.opts['environment'],
pillarenv=self.opts.get('pillarenv'),
).compile_pillar()
self.opts['pillar'] = salt.pillar.get_pillar(
self.opts,
self.opts['grains'],
self.opts['id'],
self.opts['environment'],
pillarenv=self.opts.get('pillarenv'),
).compile_pillar()
self.utils = salt.loader.utils(self.opts)
self.functions = salt.loader.minion_mods(self.opts, utils=self.utils)