From 82a784931e846422df65bba3658664c9346c3691 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 4 Jun 2014 13:22:50 -0500 Subject: [PATCH] Fix error passing play vars to an included playbook with empty vars Fixes #7658 --- lib/ansible/playbook/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index bbec4d5fdc..af28114a20 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -257,6 +257,10 @@ class PlayBook(object): elif isinstance(p['vars'], list): # nobody should really do this, but handle vars: a=1 b=2 p['vars'].extend([{k:v} for k,v in play_vars.iteritems()]) + elif p['vars'] == None: + # someone specified an empty 'vars:', so reset + # it to the vars we currently have + p['vars'] = play_vars.copy() # now add in the vars_files p['vars_files'] = utils.list_union(p.get('vars_files', []), play_vars_files)