Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure tht pillar have freshest grains #33910

Merged
merged 1 commit into from
Jun 9, 2016
Merged

Ensure tht pillar have freshest grains #33910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/minion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ def __init__(self, opts, timeout=60, safe=True, loaded_base_name=None, io_loop=N
# module. If this is a proxy, however, we need to init the proxymodule
# before we can get the grains. We do this for proxies in the
# post_master_init
if not salt.utils.is_proxy() and not self.opts.get('grains'):
if not salt.utils.is_proxy():
self.opts['grains'] = salt.loader.grains(opts)

log.info('Creating minion process manager')
Expand Down