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

Remove manual refresh code from minion.py

Browse source
This commit is contained in:
Erik Johnson 2017-03-09 12:42:21 -06:00 • committed by rallytime
parent a7e419e35f
commit d86b03dc90
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/minion.py
View file

@ -1765,15 +1765,6 @@ class Minion(MinionBase):
tagify([self.opts['id'], 'start'], 'minion'),
)
def grains_refresh_manual(self):
'''
Perform a manual grains refresh
'''
self.opts['grains'] = salt.loader.grains(
self.opts,
force_refresh=True,
proxy=getattr(self, 'proxy', None))
def module_refresh(self, force_refresh=False, notify=False):
'''
Refresh the functions and returners.
@ -1951,8 +1942,6 @@ class Minion(MinionBase):
elif tag.startswith('manage_beacons'):
self.manage_beacons(tag, data)
elif tag.startswith('grains_refresh'):
if tag == 'grains_refresh_manual':
self.grains_refresh_manual()
if (data.get('force_refresh', False) or
self.grains_cache != self.opts['grains']):
self.pillar_refresh(force_refresh=True)