ansible

Commit Graph

Author	SHA1	Message	Date
Martin Krizek	a2af8432f3	Local vars should have highest precedence in AnsibleJ2Vars (#72830 ) Ability to add local variables into AnsibleJ2Vars was added in `18a9eff11f` to fix #6653. Local variables are added using ``AnsibleJ2Vars.add_locals()`` method when creating a new context - typically when including/importing a template with context. For that use case local template variables created using ``set`` should override variables from higher contexts - either from the play or any parent template, or both; Jinja behaves the same way. Also removes AnsibleJ2Vars.extras instance variable which is not used. Also adds missing test for #6653. Fixes #72262 Fixes #72615 ci_complete	4 years ago
Martin Krizek	ff1ba39c8a	Prevent templating unused variables for {%include%} (#68749 ) Fixes #68699	4 years ago
Abhijeet Kasurde	24d1886499	template: add additional variable for dest path (#52015 ) Signed-off-by: Dustin Spicuzza <dustin@virtualroadside.com> Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	6 years ago
Julien Champseix	19dc267e4c	Allow specifying the output encoding in the template module (#42171 ) Allow specifying the source and destination files' encodings in the template module * Added output_encoding to the template module, default to utf-8 * Added documentation for the new variables * Leveraged the encoding argument on to_text() and to_bytes() to keep the implementation as simple as possible * Added integration tests with files in utf-8 and windows-1252 encodings, testing all combinations * fix bad smell test by excluding windows-1252 files from the utf8 checks * fix bad smell test by excluding valid files from the smart quote test	6 years ago
Toshio Kuratomi	f91d961cb4	Add tests for template with non-ascii filenames This is a test in response to #27262 but I could not provoke the error so it only shows that the current code is working with non-ascii filenames in this case. It doesn't show whether there's some other bug somewhere.	6 years ago
Alex Tsitsimpis	c3ab6cb9b1	template: Add option to `lstrip_blocks' and fix setting`trim_blocks` inline (#37478 ) * template: Add integration tests for `lstrip_blocks' Signed-off-by: Alex Tsitsimpis <alextsi@arrikto.com> * template: Fix passing `trim_blocks' inline Fix passing `trim_blocks' option to the template module as inline argument. Previously passing the `trim_blocks' option inline instead of using the YAML dictionary format resulted in it always being set to `True', even if `trim_blocks=False' was used. Signed-off-by: Alex Tsitsimpis <alextsi@arrikto.com> * template: Add option to `lstrip_blocks' Add option to set `lstrip_blocks' when using the template module to render Jinja templates. The Jinja documentation suggests that `trim_blocks' and `lstrip_blocks' is a great combination and the template module already provides an option for `trim_blocks'. Note that although `trim_blocks' in Ansible is enabled by default since version 2.4, in order to avoid breaking things keep `lstrip_blocks' disabled by default. Maybe in a future version it could be enabled by default. This seems to address issue #10725 in a more appropriate way than the suggested. Signed-off-by: Alex Tsitsimpis <alextsi@arrikto.com> * template: Add integration tests for `trim_blocks' Signed-off-by: Alex Tsitsimpis <alextsi@arrikto.com> * template: Check Jinja2 support for `lstrip_blocks' Since the `lstrip_blocks' option was added in Jinja2 version 2.7, raise an exception when `lstrip_blocks' is set but Jinja2 does not support it. Check support for `lstrip_blocks' option by checking `jinja2.defaults' for `LSTRIP_BLOCKS' and do not use `jinja2.__version__' because the latter is set to `unknown' in some cases, perhaps due to bug in `pkg_resources' in Python 2.6.6. Also update option description to state that Jinja2 version >=2.7 is required. Signed-off-by: Alex Tsitsimpis <alextsi@arrikto.com>	7 years ago
Martin Krizek	63fdc3f08f	Fix jinja2>=2.9 nested include vars (#35099 ) This fixes a bug when parent's local vars where not available in nested includes. The bug can only be seen with jinja>=2.9 which changes how the variable scopes work. Fixes #34886	7 years ago
Adrian Likins	359ced3833	rm unused test template in template intg tests introduced in `501fc7a248` based on my patch.	7 years ago
Zac Medico	501fc7a248	template: fix KeyError: 'undefined variable: 0 (#27972 ) * template: fix KeyError: 'undefined variable: 0 For compatibility with the Context.get_all() implementation in jinja 2.9, make AnsibleJ2Vars implement collections.Mapping. Also, make AnsibleJ2Template.newcontext() handle dict type for the 'vars' parameter. See: `d67f0fd4cc` Fixes: https://github.com/ansible/ansible/issues/20494 * add units/template/test_vars * intg tests for jinja-2.9 issues like 20494 test cases here are based on https://github.com/ansible/ansible/issues/20494#issue-202108318	7 years ago
Dag Wieers	ac43a1bbbc	Windows: Use the correct newline sequence for the platform (#21846 ) This change to the template action plugin make template use the platform's native newline_sequence for Jinja. We also added the option `newline_sequence` to change the newline sequence using by Jinja if you need to use another newline sequence than the platform default. This was previously discussed in https://github.com/ansible/ansible/issues/16255#issuecomment-278289414 And also relates to issue #21128	8 years ago
James Cammarata	188c3c608a	Don't restrict local jinja2 variables to those that start with l_ Per a change in jinja2 2.9, local variables no longer are prefixed with l_, so this updates AnsibleJ2Vars to pull in all locals (while excluding some) regardless of name. Fixes #20063 (cherry picked from commit 4d49b317929b86e1fc1b0cbace825ff73b372dc7)	8 years ago
Matt Clay	75e4645ee7	Migrate Linux CI roles to test targets. (#17997 )	8 years ago

12 Commits (9af0d916768986f50647b11f896a7cdac1550230)