Merge pull request #3577 from Tinche/extra-vars-in-playbook-includes

Enabled the use of extra vars in playbook file paths when including play...
This commit is contained in:
Michael DeHaan
2013-07-20 07:37:35 -07:00
3 changed files with 29 additions and 2 deletions

View File

@@ -130,7 +130,7 @@ class PlayBook(object):
self.basedir = os.path.dirname(playbook) or '.'
utils.plugins.push_basedir(self.basedir)
vars = {}
vars = extra_vars.copy()
if self.inventory.basedir() is not None:
vars['inventory_dir'] = self.inventory.basedir()
self.filename = playbook