wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

catch bad extra vars data earlier

Browse source 
Bad extra early (#22322)

(cherry picked from commit c71b15a696)
This commit is contained in:
Brian Coca 2017-03-07 13:44:36 -05:00 committed by Brian Coca
parent f5dbb555fa
commit bd8f81b13b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,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.utils.unicode import to_unicode, to_str from ansible.utils.unicode import to_unicode, to_str
@ -108,7 +108,12 @@ def load_extra_vars(loader, options):
else: else:
# Arguments as Key-value # Arguments as Key-value
data = parse_kv(extra_vars_opt) data = parse_kv(extra_vars_opt)
extra_vars = combine_vars(extra_vars, data)
if isinstance(data, MutableMapping):
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
def load_options_vars(options): def load_options_vars(options):