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
383dc305
Commit
383dc305
authored
Nov 09, 2012
by
Daniel Hokka Zakrisson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename varReplaceWithItems to template_ds
parent
35d841f7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
lib/ansible/playbook/play.py
+2
-2
lib/ansible/runner/__init__.py
+1
-1
lib/ansible/utils/template.py
+5
-5
test/TestUtils.py
+6
-6
No files found.
lib/ansible/playbook/play.py
View file @
383dc305
...
...
@@ -111,7 +111,7 @@ class Play(object):
plugin_name
=
k
[
5
:]
if
plugin_name
not
in
utils
.
plugins
.
lookup_loader
:
raise
errors
.
AnsibleError
(
"cannot find lookup plugin named
%
s for usage in with_
%
s"
%
(
plugin_name
,
plugin_name
))
terms
=
utils
.
varReplaceWithItem
s
(
self
.
basedir
,
x
[
k
],
task_vars
)
terms
=
utils
.
template_d
s
(
self
.
basedir
,
x
[
k
],
task_vars
)
items
=
utils
.
plugins
.
lookup_loader
.
get
(
plugin_name
,
basedir
=
self
.
basedir
,
runner
=
None
)
.
run
(
terms
,
inject
=
task_vars
)
for
item
in
items
:
...
...
@@ -119,7 +119,7 @@ class Play(object):
mv
[
'item'
]
=
item
for
t
in
tokens
[
1
:]:
(
k
,
v
)
=
t
.
split
(
"="
,
1
)
mv
[
k
]
=
utils
.
varReplaceWithItem
s
(
self
.
basedir
,
v
,
mv
)
mv
[
k
]
=
utils
.
template_d
s
(
self
.
basedir
,
v
,
mv
)
include_file
=
utils
.
template
(
self
.
basedir
,
tokens
[
0
],
mv
)
data
=
utils
.
parse_yaml_from_file
(
utils
.
path_dwim
(
self
.
basedir
,
include_file
))
for
y
in
data
:
...
...
lib/ansible/runner/__init__.py
View file @
383dc305
...
...
@@ -273,7 +273,7 @@ class Runner(object):
items_plugin
=
self
.
module_vars
.
get
(
'items_lookup_plugin'
,
None
)
if
items_plugin
is
not
None
and
items_plugin
in
utils
.
plugins
.
lookup_loader
:
items_terms
=
self
.
module_vars
.
get
(
'items_lookup_terms'
,
''
)
items_terms
=
utils
.
varReplaceWithItem
s
(
self
.
basedir
,
items_terms
,
inject
)
items_terms
=
utils
.
template_d
s
(
self
.
basedir
,
items_terms
,
inject
)
items
=
utils
.
plugins
.
lookup_loader
.
get
(
items_plugin
,
runner
=
self
,
basedir
=
self
.
basedir
)
.
run
(
items_terms
,
inject
=
inject
)
if
type
(
items
)
!=
list
:
raise
errors
.
AnsibleError
(
"lookup plugins have to return a list:
%
r"
%
items
)
...
...
lib/ansible/utils/template.py
View file @
383dc305
...
...
@@ -177,8 +177,8 @@ def _varReplaceFilesAndPipes(basedir, raw, vars):
return
''
.
join
(
done
)
def
varReplaceWithItem
s
(
basedir
,
varname
,
vars
):
'''
helper function used by with_item
s '''
def
template_d
s
(
basedir
,
varname
,
vars
):
'''
templates a data structure by traversing it and substituting for other data structure
s '''
if
isinstance
(
varname
,
basestring
):
m
=
_varFind
(
varname
,
vars
)
...
...
@@ -186,17 +186,17 @@ def varReplaceWithItems(basedir, varname, vars):
return
varname
if
m
[
'start'
]
==
0
and
m
[
'end'
]
==
len
(
varname
):
if
m
[
'replacement'
]
is
not
None
:
return
varReplaceWithItem
s
(
basedir
,
m
[
'replacement'
],
vars
)
return
template_d
s
(
basedir
,
m
[
'replacement'
],
vars
)
else
:
return
varname
else
:
return
template
(
basedir
,
varname
,
vars
)
elif
isinstance
(
varname
,
(
list
,
tuple
)):
return
[
varReplaceWithItem
s
(
basedir
,
v
,
vars
)
for
v
in
varname
]
return
[
template_d
s
(
basedir
,
v
,
vars
)
for
v
in
varname
]
elif
isinstance
(
varname
,
dict
):
d
=
{}
for
(
k
,
v
)
in
varname
.
iteritems
():
d
[
k
]
=
varReplaceWithItem
s
(
basedir
,
v
,
vars
)
d
[
k
]
=
template_d
s
(
basedir
,
v
,
vars
)
return
d
else
:
return
varname
...
...
test/TestUtils.py
View file @
383dc305
...
...
@@ -286,9 +286,9 @@ class TestUtils(unittest.TestCase):
assert
res
==
u'hello world world'
#####################################
###
varReplaceWithItem
s function tests
###
template_d
s function tests
def
test_
varReplaceWithItem
s_basic
(
self
):
def
test_
template_d
s_basic
(
self
):
vars
=
{
'data'
:
{
'var'
:
[
...
...
@@ -313,19 +313,19 @@ class TestUtils(unittest.TestCase):
}
template
=
'${data.var}'
res
=
ansible
.
utils
.
varReplaceWithItem
s
(
None
,
template
,
vars
)
res
=
ansible
.
utils
.
template_d
s
(
None
,
template
,
vars
)
assert
sorted
(
res
)
==
sorted
(
vars
[
'data'
][
'var'
])
template
=
'${data.types}'
res
=
ansible
.
utils
.
varReplaceWithItem
s
(
None
,
template
,
vars
)
res
=
ansible
.
utils
.
template_d
s
(
None
,
template
,
vars
)
assert
sorted
(
res
)
==
sorted
(
vars
[
'data'
][
'types'
])
template
=
'${data.alphas}'
res
=
ansible
.
utils
.
varReplaceWithItem
s
(
None
,
template
,
vars
)
res
=
ansible
.
utils
.
template_d
s
(
None
,
template
,
vars
)
assert
sorted
(
res
)
==
sorted
(
vars
[
'alphas'
])
template
=
'${data.nonexisting}'
res
=
ansible
.
utils
.
varReplaceWithItem
s
(
None
,
template
,
vars
)
res
=
ansible
.
utils
.
template_d
s
(
None
,
template
,
vars
)
assert
res
==
template
#####################################
...
...
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