c3ab6cb9b1
* 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> |
||
|---|---|---|
| .. | ||
| group_vars | ||
| host_vars | ||
| roles | ||
| targets | ||
| cloud-config-aws.yml.template | ||
| cloud-config-azure.yml.template | ||
| cloud-config-cs.ini.template | ||
| cloud-config-gcp.yml.template | ||
| cloud-config-openshift.kubeconfig.template | ||
| cloud-config-tower.cfg.template | ||
| dellos6.yaml | ||
| dellos9.yaml | ||
| dellos10.yaml | ||
| integration.cfg | ||
| integration_config.yml | ||
| inventory | ||
| inventory.networking.template | ||
| inventory.remote.template | ||
| inventory.winrm.template | ||
| network-integration.cfg | ||
| nxos.yaml | ||
| target-prefixes.network | ||
| windows-integration.cfg | ||