valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for minion.py wrt grains change per pylint

Browse Source 
fyi @cachedout :)
This commit is contained in:
Thomas S Hatch 2013-10-22 15:27:54 -06:00
parent 81602ae1d1
commit 05ffeff1df
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/minion.py
View File

@ -276,7 +276,6 @@ class MasterMinion(object):
self.mk_rend = rend self.mk_rend = rend
self.mk_matcher = matcher self.mk_matcher = matcher
self.gen_modules() self.gen_modules()
self.grains_cache = self.opts['grains']
def gen_modules(self): def gen_modules(self):
''' '''
@ -502,6 +501,7 @@ class Minion(object):
self.opts, self.opts,
self.functions, self.functions,
self.returners) self.returners)
self.grains_cache = self.opts['grains']
def __prep_mod_opts(self): def __prep_mod_opts(self):
''' '''
@ -930,7 +930,6 @@ class Minion(object):
} }
}) })
@property @property
def master_pub(self): def master_pub(self):
''' '''
@ -1160,13 +1159,13 @@ class Minion(object):
if self.opts['grains_refresh_every']: # If exists and is not zero. In minutes, not seconds! if self.opts['grains_refresh_every']: # If exists and is not zero. In minutes, not seconds!
if self.opts['grains_refresh_every'] > 1: if self.opts['grains_refresh_every'] > 1:
log.debug( log.debug(
"Enabling the grains refresher. Will run every {0} minutes.".format\ 'Enabling the grains refresher. Will run every {0} minutes.'.format(
(self.opts['grains_refresh_every']) self.opts['grains_refresh_every'])
) )
else: # Clean up minute vs. minutes in log message else: # Clean up minute vs. minutes in log message
log.debug( log.debug(
"Enabling the grains refresher. Will run every {0} minute.".format\ 'Enabling the grains refresher. Will run every {0} minute.'.format(
(self.opts['grains_refresh_every']) self.opts['grains_refresh_every'])
) )
self._refresh_grains_watcher( self._refresh_grains_watcher(