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

That dumb "config parsing" error is silly, and now gone

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-16 23:08:13 -06:00
parent e4b300d635
commit b17c036a6a
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/config.py
View file

@ -27,9 +27,7 @@ def minion_config(path):
try:
opts.update(yaml.load(open(path, 'r')))
except:
err = 'The salt minon configuration file did not parse correctly,'\
+ ' please check your configuration file.\nUsing defaults'
sys.stderr.write(err + '\n')
pass
opts['master_uri'] = 'tcp://' + opts['master'] + ':' + opts['master_port']
@ -62,10 +60,7 @@ def master_config(path):
try:
opts.update(yaml.load(open(path, 'r')))
except:
err = 'The salt master configuration file did not parse'\
+ ' correctly,'\
+ ' please check your configuration file.\nUsing defaults'
sys.stderr.write(err + '\n')
pass
opts['aes'] = salt.crypt.Crypticle.generate_key_string()