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

stringify the minions 'id:' declaration

Browse Source
This commit is contained in:
Kent Tenney 2011-12-01 08:40:48 -06:00
parent 3a51f9788c
commit 99ba9b9c8d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config.py
View File

@ -31,6 +31,10 @@ def load_config(opts, path, env_var):
if conf_opts == None: if conf_opts == None:
# The config file is empty and the yaml.load returned None # The config file is empty and the yaml.load returned None
conf_opts = {} conf_opts = {}
else:
# allow using numeric ids: convert int to string
if 'id' in conf_opts:
conf_opts['id'] = str(conf_opts['id'])
opts.update(conf_opts) opts.update(conf_opts)
opts['conf_file'] = path opts['conf_file'] = path
except Exception, e: except Exception, e: