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
5be384ba
Commit
5be384ba
authored
Jul 25, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11733 from amenonsen/csvfile
v2 breakage: lookupfile should lookup the given file=xxx
parents
6c1f4ddf
8156ad37
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
lib/ansible/plugins/lookup/csvfile.py
+1
-1
v1/ansible/runner/lookup_plugins/csvfile.py
+4
-1
No files found.
lib/ansible/plugins/lookup/csvfile.py
View file @
5be384ba
...
...
@@ -75,7 +75,7 @@ class LookupModule(LookupBase):
if
paramvals
[
'delimiter'
]
==
'TAB'
:
paramvals
[
'delimiter'
]
=
"
\t
"
lookupfile
=
self
.
_loader
.
path_dwim_relative
(
basedir
,
'files'
,
term
)
lookupfile
=
self
.
_loader
.
path_dwim_relative
(
basedir
,
'files'
,
paramvals
[
'file'
]
)
var
=
self
.
read_csv
(
lookupfile
,
key
,
paramvals
[
'delimiter'
],
paramvals
[
'default'
],
paramvals
[
'col'
])
if
var
is
not
None
:
if
type
(
var
)
is
list
:
...
...
v1/ansible/runner/lookup_plugins/csvfile.py
View file @
5be384ba
...
...
@@ -63,7 +63,10 @@ class LookupModule(object):
for
param
in
params
[
1
:]:
name
,
value
=
param
.
split
(
'='
)
assert
(
name
in
paramvals
)
paramvals
[
name
]
=
value
if
name
==
'delimiter'
:
paramvals
[
name
]
=
str
(
value
)
else
:
paramvals
[
name
]
=
value
except
(
ValueError
,
AssertionError
),
e
:
raise
errors
.
AnsibleError
(
e
)
...
...
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