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 4

clean up config.py for better pylint foo

Browse source
This commit is contained in:
Thomas S Hatch 2011-02-27 15:18:09 -07:00
parent ea36924bfd
commit 8c1b94ae99
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/config.py
View file

@ -1,4 +1,6 @@
'''
All salt configuration loading and defaults should be in this module
'''
# Import python modules
import os
import socket
@ -16,7 +18,7 @@ def minion_config(path):
}
if os.path.isfile(path):
opts.update(yaml.load(open(conf, 'r')))
opts.update(yaml.load(open(path, 'r')))
opts['master_uri'] = 'tcp://' + opts['master'] + ':' + opts['master_port']
@ -29,6 +31,6 @@ def master_config(path):
opts = {}
if os.path.isfile(path):
opts.update(yaml.load(open(conf, 'r')))
opts.update(yaml.load(open(path, 'r')))
return opts