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

#2691 - Minion must wait for master to accept key.

Browse Source
This commit is contained in:
tsclausing 2012-11-25 12:25:49 -06:00
parent b1427e1fc8
commit 057b658bdc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/minion.py
View File

@ -174,6 +174,7 @@ class Minion(object):
# module
opts['grains'] = salt.loader.grains(opts)
self.opts = opts
self.authenticate()
self.opts['pillar'] = salt.pillar.get_pillar(
opts,
opts['grains'],
@ -185,7 +186,6 @@ class Minion(object):
self.functions, self.returners = self.__load_modules()
self.matcher = Matcher(self.opts, self.functions)
self.proc_dir = get_proc_dir(opts['cachedir'])
self.authenticate()
def __prep_mod_opts(self):
'''