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

dont merge extra vars data if none

Browse source 
fixes #21889
This commit is contained in:
Brian Coca 2017-02-27 09:06:31 -05:00 committed by Brian Coca
parent bfb3467d52
commit e0975602d1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,6 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import ast
import os
import random
import uuid
@ -120,6 +119,7 @@ def merge_hash(a, b):
def load_extra_vars(loader, options):
extra_vars = {}
for extra_vars_opt in options.extra_vars:
data = None
extra_vars_opt = to_text(extra_vars_opt, errors='surrogate_or_strict')
if extra_vars_opt.startswith(u"@"):
# Argument is a YAML file (JSON is a subset of YAML)
@ -130,7 +130,10 @@ def load_extra_vars(loader, options):
else:
# Arguments as Key-value
data = parse_kv(extra_vars_opt)
extra_vars = combine_vars(extra_vars, data)
if data is not None:
extra_vars = combine_vars(extra_vars, data)
return extra_vars