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
0cd0a7fd
Commit
0cd0a7fd
authored
Feb 13, 2013
by
Michel Blanc
Committed by
Michael DeHaan
Feb 16, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes jina typos
Moved *jina* to *jinja2*
parent
1c22f214
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
examples/ansible.cfg
+2
-2
lib/ansible/constants.py
+1
-1
lib/ansible/utils/template.py
+2
-2
No files found.
examples/ansible.cfg
View file @
0cd0a7fd
...
...
@@ -91,10 +91,10 @@ sudo_exe=sudo
# if you need to use jinja2 extensions, you can list them here
# use a coma to separate extensions, e.g. :
# jinja_extensions=jinja2.ext.do,jinja2.ext.i18n
# jinja
2
_extensions=jinja2.ext.do,jinja2.ext.i18n
# no extensions are loaded by default
#jinja_extensions=
#jinja
2
_extensions=
# if set, always use this private key file for authentication, same as if passing
# --private-key to ansible or ansible-playbook
...
...
lib/ansible/constants.py
View file @
0cd0a7fd
...
...
@@ -94,7 +94,7 @@ DEFAULT_KEEP_REMOTE_FILES = get_config(p, DEFAULTS, 'keep_remote_files', 'ANSIBL
DEFAULT_SUDO_EXE
=
get_config
(
p
,
DEFAULTS
,
'sudo_exe'
,
'ANSIBLE_SUDO_EXE'
,
'sudo'
)
DEFAULT_SUDO_FLAGS
=
get_config
(
p
,
DEFAULTS
,
'sudo_flags'
,
'ANSIBLE_SUDO_FLAGS'
,
'-H'
)
DEFAULT_HASH_BEHAVIOUR
=
get_config
(
p
,
DEFAULTS
,
'hash_behaviour'
,
'ANSIBLE_HASH_BEHAVIOUR'
,
'replace'
)
DEFAULT_JIN
A_EXTENSIONS
=
get_config
(
p
,
DEFAULTS
,
'jinja_extensions'
,
'ANSIBLE_JINA
_EXTENSIONS'
,
None
)
DEFAULT_JIN
JA2_EXTENSIONS
=
get_config
(
p
,
DEFAULTS
,
'jinja2_extensions'
,
'ANSIBLE_JINJA2
_EXTENSIONS'
,
None
)
DEFAULT_ACTION_PLUGIN_PATH
=
shell_expand_path
(
get_config
(
p
,
DEFAULTS
,
'action_plugins'
,
'ANSIBLE_ACTION_PLUGINS'
,
'/usr/share/ansible_plugins/action_plugins'
))
DEFAULT_CALLBACK_PLUGIN_PATH
=
shell_expand_path
(
get_config
(
p
,
DEFAULTS
,
'callback_plugins'
,
'ANSIBLE_CALLBACK_PLUGINS'
,
'/usr/share/ansible_plugins/callback_plugins'
))
...
...
lib/ansible/utils/template.py
View file @
0cd0a7fd
...
...
@@ -319,12 +319,12 @@ def template_from_file(basedir, path, vars):
to load them with the jinja environment
'''
jinja_exts
=
[]
if
C
.
DEFAULT_JIN
A
_EXTENSIONS
:
if
C
.
DEFAULT_JIN
JA2
_EXTENSIONS
:
'''
Let's make sure the configuration directive doesn't contain spaces
and split extensions in an array
'''
jinja_exts
=
C
.
DEFAULT_JIN
A
_EXTENSIONS
.
replace
(
" "
,
""
)
.
split
(
','
)
jinja_exts
=
C
.
DEFAULT_JIN
JA2
_EXTENSIONS
.
replace
(
" "
,
""
)
.
split
(
','
)
environment
=
jinja2
.
Environment
(
loader
=
loader
,
trim_blocks
=
True
,
extensions
=
jinja_exts
)
for
filter_plugin
in
utils
.
plugins
.
filter_loader
.
all
():
...
...
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