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
dbd755e0
Commit
dbd755e0
authored
Aug 04, 2015
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix jinja2 template search pathing
Fixes #9933
parent
479c4a4b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletions
+13
-1
lib/ansible/plugins/action/template.py
+5
-0
lib/ansible/plugins/lookup/template.py
+7
-0
lib/ansible/template/__init__.py
+1
-1
No files found.
lib/ansible/plugins/action/template.py
View file @
dbd755e0
...
...
@@ -111,6 +111,11 @@ class ActionModule(ActionBase):
time
.
localtime
(
os
.
path
.
getmtime
(
source
))
)
self
.
_templar
.
environment
.
searchpath
=
[
self
.
_loader
.
_basedir
,
os
.
path
.
dirname
(
source
)]
if
self
.
_task
.
_role
is
not
None
:
self
.
_templar
.
environment
.
searchpath
.
insert
(
1
,
C
.
DEFAULT_ROLES_PATH
)
self
.
_templar
.
environment
.
searchpath
.
insert
(
1
,
self
.
_task
.
_role
.
_role_path
)
old_vars
=
self
.
_templar
.
_available_variables
self
.
_templar
.
set_available_variables
(
temp_vars
)
resultant
=
self
.
_templar
.
template
(
template_data
,
preserve_trailing_newlines
=
True
,
convert_data
=
False
)
...
...
lib/ansible/plugins/lookup/template.py
View file @
dbd755e0
...
...
@@ -19,6 +19,7 @@ __metaclass__ = type
import
os
from
ansible
import
constants
as
C
from
ansible.errors
import
AnsibleError
from
ansible.plugins.lookup
import
LookupBase
...
...
@@ -41,6 +42,12 @@ class LookupModule(LookupBase):
if
lookupfile
and
os
.
path
.
exists
(
lookupfile
):
with
open
(
lookupfile
,
'r'
)
as
f
:
template_data
=
f
.
read
()
self
.
_templar
.
environment
.
searchpath
=
[
self
.
_loader
.
_basedir
,
os
.
path
.
dirname
(
lookupfile
)]
if
'role_path'
in
variables
:
self
.
_templar
.
environment
.
searchpath
.
insert
(
1
,
C
.
DEFAULT_ROLES_PATH
)
self
.
_templar
.
environment
.
searchpath
.
insert
(
1
,
variables
[
'role_path'
])
res
=
self
.
_templar
.
template
(
template_data
,
preserve_trailing_newlines
=
True
)
ret
.
append
(
res
)
else
:
...
...
lib/ansible/template/__init__.py
View file @
dbd755e0
...
...
@@ -82,7 +82,7 @@ class Templar:
undefined
=
StrictUndefined
,
extensions
=
self
.
_get_extensions
(),
finalize
=
self
.
_finalize
,
loader
=
FileSystemLoader
(
'.'
),
loader
=
FileSystemLoader
(
self
.
_basedir
),
)
self
.
environment
.
template_class
=
AnsibleJ2Template
...
...
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