summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-08-14 10:55:26 -0500
committerJames Cammarata <jimi@sngx.net>2014-08-14 15:04:27 -0500
commitd9fb94378c2845877fcac4392397a6606b44b832 (patch)
tree193f118f743fe6d4eed9b15b5ab513a490f55fd3
parent293b11e45d340b56b6ff72d8c7f3701d60abf6dc (diff)
downloadansible-d9fb94378c2845877fcac4392397a6606b44b832.tar.gz
Fixing variable name bug introduced in ac8950f
Fixes #8617
-rw-r--r--lib/ansible/playbook/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
index 777df924b2..3b5a3ebf3f 100644
--- a/lib/ansible/playbook/__init__.py
+++ b/lib/ansible/playbook/__init__.py
@@ -232,10 +232,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()])