cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

InventoryScript: better syntax checking for json stream

Browse source
This commit is contained in:
Serge van Ginderachter 2014-08-21 17:53:11 +02:00
parent b8d057296a
commit 3a228b9d55
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/inventory/script.py
View file

@ -84,10 +84,14 @@ class InventoryScript(object):
if not isinstance(data, dict):
data = {'hosts': data}
# is not those subkeys, then simplified syntax, host with vars
elif not any(k in data for k in ('hosts','vars')):
data = {'hosts': [group_name], 'vars': data}
if 'hosts' in data:
if not isinstance(data['hosts'], list):
raise errors.AnsibleError("You defined a group \"%s\" with bad "
"data for the host list:\n %s" % (group_name, data))
for hostname in data['hosts']:
if not hostname in all_hosts:
@ -96,6 +100,10 @@ class InventoryScript(object):
group.add_host(host)
if 'vars' in data:
if not isinstance(data['vars'], dict):
raise errors.AnsibleError("You defined a group \"%s\" with bad "
"data for variables:\n %s" % (group_name, data))
for k, v in data['vars'].iteritems():
if group.name == all.name:
all.set_variable(k, v)