|
|
@ -175,6 +175,7 @@ class PlayBook(object):
|
|
|
|
|
|
|
|
|
|
|
|
(k,v) = t.split("=", 1)
|
|
|
|
(k,v) = t.split("=", 1)
|
|
|
|
incvars[k] = utils.template(basedir, v, incvars)
|
|
|
|
incvars[k] = utils.template(basedir, v, incvars)
|
|
|
|
|
|
|
|
|
|
|
|
included_path = utils.path_dwim(basedir, utils.template(basedir, tokens[0], incvars))
|
|
|
|
included_path = utils.path_dwim(basedir, utils.template(basedir, tokens[0], incvars))
|
|
|
|
(plays, basedirs) = self._load_playbook_from_file(included_path, incvars)
|
|
|
|
(plays, basedirs) = self._load_playbook_from_file(included_path, incvars)
|
|
|
|
for p in plays:
|
|
|
|
for p in plays:
|
|
|
@ -187,8 +188,10 @@ class PlayBook(object):
|
|
|
|
elif isinstance(p['vars'], list):
|
|
|
|
elif isinstance(p['vars'], list):
|
|
|
|
# nobody should really do this, but handle vars: a=1 b=2
|
|
|
|
# nobody should really do this, but handle vars: a=1 b=2
|
|
|
|
p['vars'].extend([dict(k=v) for k,v in incvars.iteritems()])
|
|
|
|
p['vars'].extend([dict(k=v) for k,v in incvars.iteritems()])
|
|
|
|
|
|
|
|
|
|
|
|
accumulated_plays.extend(plays)
|
|
|
|
accumulated_plays.extend(plays)
|
|
|
|
play_basedirs.extend(basedirs)
|
|
|
|
play_basedirs.extend(basedirs)
|
|
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
|
|
|
|
|
|
|
|
# this is a normal (non-included play)
|
|
|
|
# this is a normal (non-included play)
|
|
|
|