Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
c5d98234
Commit
c5d98234
authored
Apr 10, 2013
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some items related to playbook includes and indentation.
parent
290780d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
docsite/rst/gettingstarted.rst
+1
-1
lib/ansible/playbook/__init__.py
+17
-14
No files found.
docsite/rst/gettingstarted.rst
View file @
c5d98234
...
...
@@ -223,7 +223,7 @@ Tagged Releases
Tarballs of releases are available on the ansible.cc page.
* `Ansible/downloads <http
s
://ansible.cc/releases>`_
* `Ansible/downloads <http://ansible.cc/releases>`_
These releases are also tagged in the git repository with the release version.
...
...
lib/ansible/playbook/__init__.py
View file @
c5d98234
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment