Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor

This commit is contained in:
James Cammarata
2014-07-07 14:16:37 -05:00
7 changed files with 299 additions and 231 deletions

View File

@@ -164,6 +164,10 @@ class PlayBook(object):
self.basedir = os.path.dirname(playbook) or '.'
utils.plugins.push_basedir(self.basedir)
# let inventory know the playbook basedir so it can load more vars
self.inventory.set_playbook_basedir(self.basedir)
vars = extra_vars.copy()
vars['playbook_dir'] = self.basedir
if self.inventory.basedir() is not None: