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

Fixing variable name bug introduced in ac8950f

Browse source 
Fixes #8617
This commit is contained in:
James Cammarata 2014-08-14 10:55:26 -05:00
parent bea0845322
commit a01d97f12b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/playbook/__init__.py
View file

@ -236,10 +236,10 @@ class PlayBook(object):
return vars.copy()
play_vars = None
if isinstance(play_vars, dict):
if isinstance(play['vars'], dict):
play_vars = play['vars'].copy()
play_vars.update(vars)
elif isinstance(play_vars, list):
elif isinstance(play['vars'], list):
# nobody should really do this, but handle vars: a=1 b=2
play_vars = play['vars'][:]
play_vars.extend([{k:v} for k,v in vars.iteritems()])