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
82a78493
Commit
82a78493
authored
Jun 04, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error passing play vars to an included playbook with empty vars
Fixes #7658
parent
8ff0c0f2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
lib/ansible/playbook/__init__.py
+4
-0
No files found.
lib/ansible/playbook/__init__.py
View file @
82a78493
...
@@ -257,6 +257,10 @@ class PlayBook(object):
...
@@ -257,6 +257,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
([{
k
:
v
}
for
k
,
v
in
play_vars
.
iteritems
()])
p
[
'vars'
]
.
extend
([{
k
:
v
}
for
k
,
v
in
play_vars
.
iteritems
()])
elif
p
[
'vars'
]
==
None
:
# someone specified an empty 'vars:', so reset
# it to the vars we currently have
p
[
'vars'
]
=
play_vars
.
copy
()
# now add in the vars_files
# now add in the vars_files
p
[
'vars_files'
]
=
utils
.
list_union
(
p
.
get
(
'vars_files'
,
[]),
play_vars_files
)
p
[
'vars_files'
]
=
utils
.
list_union
(
p
.
get
(
'vars_files'
,
[]),
play_vars_files
)
...
...
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