cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes jina typos

Browse source 
Moved *jina* to *jinja2*
This commit is contained in:
Michel Blanc 2013-02-13 17:33:43 +01:00 committed by Michael DeHaan
parent 1c22f2146e
commit 0cd0a7fda3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/ansible.cfg
View file

@ -91,10 +91,10 @@ sudo_exe=sudo
# if you need to use jinja2 extensions, you can list them here # if you need to use jinja2 extensions, you can list them here
# use a coma to separate extensions, e.g. : # use a coma to separate extensions, e.g. :
# jinja_extensions=jinja2.ext.do,jinja2.ext.i18n # jinja2_extensions=jinja2.ext.do,jinja2.ext.i18n
# no extensions are loaded by default # no extensions are loaded by default
#jinja_extensions= #jinja2_extensions=
# if set, always use this private key file for authentication, same as if passing # if set, always use this private key file for authentication, same as if passing
# --private-key to ansible or ansible-playbook # --private-key to ansible or ansible-playbook

2
lib/ansible/constants.py
View file

@ -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_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_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_HASH_BEHAVIOUR = get_config(p, DEFAULTS, 'hash_behaviour', 'ANSIBLE_HASH_BEHAVIOUR', 'replace')
DEFAULT_JINA_EXTENSIONS = get_config(p, DEFAULTS, 'jinja_extensions', 'ANSIBLE_JINA_EXTENSIONS', None) DEFAULT_JINJA2_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_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')) DEFAULT_CALLBACK_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins'))

4
lib/ansible/utils/template.py
View file

@ -319,12 +319,12 @@ def template_from_file(basedir, path, vars):
to load them with the jinja environment to load them with the jinja environment
''' '''
jinja_exts = [] jinja_exts = []
if C.DEFAULT_JINA_EXTENSIONS: if C.DEFAULT_JINJA2_EXTENSIONS:
''' '''
Let's make sure the configuration directive doesn't contain spaces Let's make sure the configuration directive doesn't contain spaces
and split extensions in an array and split extensions in an array
''' '''
jinja_exts = C.DEFAULT_JINA_EXTENSIONS.replace(" ", "").split(',') jinja_exts = C.DEFAULT_JINJA2_EXTENSIONS.replace(" ", "").split(',')
environment = jinja2.Environment(loader=loader, trim_blocks=True, extensions=jinja_exts) environment = jinja2.Environment(loader=loader, trim_blocks=True, extensions=jinja_exts)
for filter_plugin in utils.plugins.filter_loader.all(): for filter_plugin in utils.plugins.filter_loader.all():