cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some items related to playbook includes and indentation.

Browse source
This commit is contained in:
Michael DeHaan 2013-04-10 15:04:41 -04:00
parent 290780d13f
commit c5d9823467
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docsite/rst/gettingstarted.rst
View file

@ -223,7 +223,7 @@ Tagged Releases
Tarballs of releases are available on the ansible.cc page.
* `Ansible/downloads <https://ansible.cc/releases>`_
* `Ansible/downloads <http://ansible.cc/releases>`_
These releases are also tagged in the git repository with the release version.

31
lib/ansible/playbook/__init__.py
View file

@ -175,20 +175,23 @@ class PlayBook(object):
(k,v) = t.split("=", 1)
incvars[k] = utils.template(basedir, v, incvars)
included_path = utils.path_dwim(basedir, utils.template(basedir, tokens[0], incvars))
(plays, basedirs) = self._load_playbook_from_file(included_path, incvars)
for p in plays:
# support for parameterized play includes works by passing
# those variables along to the subservient play
if 'vars' not in p:
p['vars'] = {}
if isinstance(p['vars'], dict):
p['vars'].update(incvars)
elif isinstance(p['vars'], list):
# nobody should really do this, but handle vars: a=1 b=2
p['vars'].extend([dict(k=v) for k,v in incvars.iteritems()])
accumulated_plays.extend(plays)
play_basedirs.extend(basedirs)
included_path = utils.path_dwim(basedir, utils.template(basedir, tokens[0], incvars))
(plays, basedirs) = self._load_playbook_from_file(included_path, incvars)
for p in plays:
# support for parameterized play includes works by passing
# those variables along to the subservient play
if 'vars' not in p:
p['vars'] = {}
if isinstance(p['vars'], dict):
p['vars'].update(incvars)
elif isinstance(p['vars'], list):
# nobody should really do this, but handle vars: a=1 b=2
p['vars'].extend([dict(k=v) for k,v in incvars.iteritems()])
accumulated_plays.extend(plays)
play_basedirs.extend(basedirs)
else:
# this is a normal (non-included play)