if a playbook has no vars - still include the global vars

2012-05-03 15:52:02 -04:00 · 2012-05-03 15:52:02 -04:00 · 38ea61054f
commit 38ea61054f
parent dc35dd99c0
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/playbook.py
+++ b/lib/ansible/playbook.py
@ -135,7 +135,7 @@ class PlayBook(object):
                k, v = item.items()[0]
                vars[k] = v
        else:
-            vars = play['vars']
+            vars.update(play['vars'])

        vars_prompt = play.get('vars_prompt', {})
        if type(vars_prompt) != dict: