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

Merge pull request #1607 from jagster02/develop

Browse Source 
Fixes syndic init failure due to cli attribute error
This commit is contained in:
Thomas S Hatch 2012-07-10 18:45:18 -07:00
commit d0089b2296
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
salt/__init__.py
View File

@ -258,13 +258,13 @@ class Syndic(object):
if self.cli['user']: if self.cli['user']:
self.opts['user'] = self.cli['user'] self.opts['user'] = self.cli['user']
def __prep_opts(self): def __prep_opts(self, cli):
''' '''
Generate the opts used by the syndic Generate the opts used by the syndic
''' '''
opts = salt.config.master_config(self.cli['master_config']) opts = salt.config.master_config(cli['master_config'])
opts['_minion_conf_file'] = opts['conf_file'] opts['_minion_conf_file'] = opts['conf_file']
opts.update(salt.config.minion_config(self.cli['minion_config'])) opts.update(salt.config.minion_config(cli['minion_config']))
if 'syndic_master' in opts: if 'syndic_master' in opts:
# Some of the opts need to be changed to match the needed opts # Some of the opts need to be changed to match the needed opts
# in the minion class. # in the minion class.
@ -319,7 +319,14 @@ class Syndic(object):
', '.join([repr(l) for l in salt.log.LOG_LEVELS])) ', '.join([repr(l) for l in salt.log.LOG_LEVELS]))
options, args = parser.parse_args() options, args = parser.parse_args()
self.opts = self.__prep_opts()
cli = {'daemon': options.daemon,
'minion_config': options.minion_config,
'master_config': options.master_config,
'pidfile': options.pidfile,
'user': options.user}
self.opts = self.__prep_opts(cli)
if not options.log_level: if not options.log_level:
options.log_level = self.opts['log_level'] options.log_level = self.opts['log_level']
@ -330,12 +337,6 @@ class Syndic(object):
date_format=self.opts['log_datefmt'] date_format=self.opts['log_datefmt']
) )
cli = {'daemon': options.daemon,
'minion_config': options.minion_config,
'master_config': options.master_config,
'pidfile': options.pidfile,
'user': options.user}
return cli return cli
def start(self): def start(self):