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

Bad extra early (#22322)

Browse source 
* catch bad extra vars data earlier

* incoporated @alkins feedback
This commit is contained in:
Brian Coca 2017-03-07 13:44:36 -05:00 committed by GitHub
parent 1ea3313c90
commit c71b15a696
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/utils/vars.py
View file

@ -29,7 +29,7 @@ from collections import MutableMapping
from ansible.compat.six import iteritems, string_types from ansible.compat.six import iteritems, string_types
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError from ansible.errors import AnsibleError, AnsibleOptionsError
from ansible.parsing.splitter import parse_kv from ansible.parsing.splitter import parse_kv
from ansible.module_utils._text import to_native, to_text from ansible.module_utils._text import to_native, to_text
@ -131,8 +131,10 @@ def load_extra_vars(loader, options):
# Arguments as Key-value # Arguments as Key-value
data = parse_kv(extra_vars_opt) data = parse_kv(extra_vars_opt)
if data is not None: if isinstance(data, MutableMapping):
extra_vars = combine_vars(extra_vars, data) extra_vars = combine_vars(extra_vars, data)
else:
raise AnsibleOptionsError("Invalid extra vars data supplied. '%s' could not be made into a dictionary" % extra_vars_opt)
return extra_vars return extra_vars