8c4161d4a1
Merge branch 'retf_py' of git://github.com/berendt/ansible into devel
...
Conflicts:
lib/ansible/inventory/vars_plugins/group_vars.py
plugins/callbacks/mail.py
2014-08-08 12:17:37 -04:00
a9f0f8e975
Revert "template.py: Handle purposely raised exceptions in lookup()"
...
This reverts commit 2fda9bc743
2014-07-28 23:25:37 -05:00
0e5b0a2e97
Revert "Set Jinja2's keep_trailing_newline=True in template_from_string."
...
This reverts commit 7a8eb0b670
2014-07-17 09:07:04 -05:00
7a8eb0b670
Set Jinja2's keep_trailing_newline=True in template_from_string.
...
Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
2014-07-14 13:36:17 -07:00
de64bbdc5f
Support a whitelisted subset of jinja2 template options
2014-07-02 21:14:26 -07:00
8ed6350e65
When parsing json from untrusted sources, remove templating tags
2014-07-01 14:14:14 -05:00
f8bf9cdeec
Handle TemplateNotFound to render more helpful error message.
...
At the point the exception is handled, it is likely due to error loading
a sub-template included from main template. Besides file not found, it
can be caused also by include path failing Jinja2 checks. Now, when
rendering the exception from Jinja, it will include exception name. This
will give basic context or *what* the error is.
Fixes #7103
Fixes #7105
2014-06-23 15:02:58 -05:00
2fda9bc743
template.py: Handle purposely raised exceptions in lookup()
...
If a lookup plugin is run by the lookup() template method it should pass
along any AnsibleError (or child exception classes) rather than just eat
them. These exceptions are purposely raised by the plugin.
2014-05-30 16:41:20 -04:00
6676720ce5
fixed typos found by RETF rules in PY files
...
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
2014-05-03 18:40:05 +02:00
5a65dc3b6a
Fixes #6820 fix erroneous missing vault password error when using the template module
2014-04-04 13:06:35 -04:00
2a976ac313
Fixes #5059 Ignore lookup failures when templating a task name
2014-03-26 11:28:43 -04:00
8c7828d469
Tweaking error message resulting from undefined template variables
...
Fixes #5114
2014-03-25 11:56:55 -05:00
ad70e9bcd6
Fixes #6227 skip non-unicode strings and catch decode errors silently in template_from_string
2014-03-17 16:54:25 -04:00
d1753046e0
Revert "Correctly catch template errors without returning invalid data"
...
This reverts commit 3cd7d47b7e
2014-03-13 07:46:19 -04:00
3cd7d47b7e
Correctly catch template errors without returning invalid data
...
Fixes #6329
2014-03-07 14:36:54 -06:00
46ec8759d5
Remove the legacy templating code, which was guarded by deprecation warnings in the previous two releases, and undocumented for a long time. use {{ foo }} to access variables instead of ${foo} or $foo.
2014-02-28 18:38:45 -05:00
a72dc2ec34
Use finalize method in jinja2 to convert None values to empty strings
...
Fixes #4812
2014-02-06 00:43:31 -06:00
959a156195
Properly count newlines appearing at the end of templates after rendering
...
Fixes #4633
2014-02-05 15:14:19 -06:00
3fddd78ec5
Fixing traceback caused by incorrect argument passing to json.dumps
...
Fixes #5756
2014-01-27 11:28:07 -06:00
21fdb2bbc7
Fixes #5200 Handle template contents with unicode strings better
2014-01-03 11:18:20 -05:00
8752ae6909
Fix for issue #4730 - stacktrace when deferenencing a non-existent group
2013-12-02 18:25:43 +01:00
9101c2af98
Fix traceback in template error detection code
...
Fixes #5081
2013-11-29 08:47:54 -06:00
8dbd91b5ad
fix typo in deprecation warning
2013-11-23 19:15:51 -02:00
fc909b453f
Make the legacy template detection system not hit a false positive when
...
replacing a \$ with $.
2013-11-18 17:51:57 -05:00
90cce35919
This allows variable references in playbooks in a different way.
2013-10-30 21:26:16 -04:00
d154bf8781
Revert templating enhancements from 73dbab70 e6c28658 d409352c 9858b1f2 4587528b 9b1fe455 214b0b05 8d3db803 7f9504d1 5031104c 35cb9dc2 2bd8cb57 1e85c754
2013-10-30 10:50:16 -04:00
73dbab702f
Don't run lookup plugins while trying to simplify the input datastructure.
2013-10-28 09:08:53 -04:00
4587528b99
Fix typo in comment.
2013-10-26 19:32:07 -04:00
d409352c85
Remove some interior imports in the code. Not really needed but nice to have them gone.
2013-10-26 19:26:43 -04:00
e6c28658b4
Add in some code to pre-template datastructures prior to template usage. This prevents a certain class of error
...
where filter evaluations can happen too early due to the template engine recursion being a bit limited.
Addresses #4662
2013-10-26 19:11:13 -04:00
9858b1f2f3
Enable imports to work on a snippet based system, allowing for instance a library of common EC2 functions
...
to be reused between modules. See library/system/service and library/system/ping for initial examples. Can
work the old way to just import 'basic', or can import the new way to import multiple pieces of code from
module_utils/.
2013-10-26 11:09:30 -04:00
9b1fe455c6
Fixes #4549 Do not call lookup plugins when templating a task's name
2013-10-25 10:27:38 -04:00
214b0b052c
Fixes #4608 add lookup to template globals to make plugins work again
2013-10-22 12:00:54 -04:00
2bd8cb5790
Make the deprecation detector in templates more accurate. Fixes #4514 .
2013-10-19 14:14:16 -04:00
7f9504d14d
Fix a typo.
2013-10-19 13:52:48 -04:00
8d3db80370
Some misc cleanup and removal of unused imports.
2013-10-19 13:50:14 -04:00
5031104c3a
Finishing touches on template cleanup.
2013-10-19 11:40:48 -04:00
1e85c7544b
Further WIP on template cleanup.
2013-10-19 11:39:52 -04:00
35cb9dc22f
Work in progress about cleaning up template code.
2013-10-19 11:39:52 -04:00
922f61899e
Throw a more user-friendly exception during template rendering process.
2013-10-16 16:48:17 +02:00
add45d2ca9
Fixup legacy var detector.
2013-10-11 19:16:36 -04:00
a45494a896
Add warnings feature.
2013-10-11 19:04:26 -04:00
9637f620d7
Deprecation warnings of several flavors, nice and purple and can be disabled
...
in ansible.cfg.
2013-10-11 18:37:39 -04:00
c69e19c6a6
Enhance references to logging functionality. Fixes #3431 .
2013-10-08 08:26:40 -04:00
7f7116de3b
commit 9db4f7a made a change that also needed to include this to retain correct legacy_playbook_variables behavior
2013-09-25 23:22:09 -04:00
3569a2ffee
Handle AnsibleUndefinedVariable's raised from lookup plugins like jinja2 UndefinedError's
2013-09-20 19:56:12 -05:00
294451d002
Correctly handle variable issues when evaluating jinja2 when statements
...
Fixes #4025
2013-09-09 14:50:21 -05:00
fff4f1da33
Improve behavior with error_on_undefined_vars enabled
...
Pass fail_on_undefined flag to recursive calls to `template` function,
so more undefined variables are detected.
Works only for Jinja style variables. Undefined legacy variables are
never detected.
2013-08-20 00:40:49 -05:00
581a0c9f59
now correctly 'types' value pairs that are passed as options to jinja
...
override
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-08-01 21:08:23 -04:00
2d88c70cd5
Introduce exception AnsibleFilterError and use it in Jinja filters. Ignore this exception when trying to find the name of a task for display (callback) purpose.
2013-07-07 19:18:32 +02:00
Michael DeHaan
James Cammarata
Jacob Leverich
Henry Finucane
Paul Sokolovsky
Jack Neely
Christian Berendt
James Tanner
Michael DeHaan
James Cammarata
Janez Nemanic
Antonio Zanardo
Tomaz Muraus
Matt Coddington
Alek Storm
Petr Svoboda
Brian Coca
Stoned Elipot