~chad.smith/cloud-init:jinja-for-cloud-config

Branch merges

Propose for merging

Merged into cloud-init:master

Server Team CI bot: Approve (continuous-integration) on 2018-09-11

Scott Moser: Approve on 2018-09-11

Chad Smith: Abstain on 2018-02-09

Diff: 1689 lines (+959/-110)

27 files modified

bash_completion/cloud-init (+2/-0)
cloudinit/cmd/devel/__init__.py (+25/-0)
cloudinit/cmd/devel/parser.py (+4/-1)
cloudinit/cmd/devel/render.py (+90/-0)
cloudinit/cmd/devel/tests/test_render.py (+101/-0)
cloudinit/cmd/main.py (+15/-1)
cloudinit/handlers/__init__.py (+8/-3)
cloudinit/handlers/boot_hook.py (+5/-7)
cloudinit/handlers/cloud_config.py (+5/-10)
cloudinit/handlers/jinja_template.py (+137/-0)
cloudinit/handlers/shell_script.py (+3/-6)
cloudinit/handlers/upstart_job.py (+3/-6)
cloudinit/helpers.py (+4/-0)
cloudinit/log.py (+10/-2)
cloudinit/sources/__init__.py (+31/-16)
cloudinit/sources/tests/test_init.py (+61/-14)
cloudinit/stages.py (+14/-8)
cloudinit/templater.py (+25/-3)
cloudinit/tests/helpers.py (+9/-0)
doc/rtd/topics/capabilities.rst (+12/-3)
doc/rtd/topics/datasources.rst (+47/-0)
doc/rtd/topics/format.rst (+17/-4)
tests/cloud_tests/testcases/base.py (+4/-4)
tests/unittests/test_builtin_handlers.py (+302/-22)
tests/unittests/test_handler/test_handler_etc_hosts.py (+1/-0)
tests/unittests/test_handler/test_handler_ntp.py (+1/-0)
tests/unittests/test_templating.py (+23/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

5fc9a07... by Chad Smith on 2018-08-28

jinja2: mandatory decorator magic for 2.7 is el-stinko.

jinja in python2.7 has a decorator implements_to_string which
adapts the behavior of the str method on a given class to encode
utf-8 the return value. Problem is that all subclasses of
Undefined need to use this decorator if overriding the __str__
method. Without the decorator, subclass.__str__ results in the
encoded response of the parent's __str__.

Also fix pycodestyle/flakes.

fa268a7... by Chad Smith on 2018-08-28

py2 jinja behaves differently than py3 upon undefined errors. separate tests

c1ef02b... by Chad Smith on 2018-08-27

lints/pycodestyle

fa51167... by Chad Smith on 2018-08-27

use templater.JINJA_AVAILABLE in unit test skip decorators

2aa7132... by Chad Smith on 2018-08-27

sort instance-data keys in convert_jinja_instance_data and publish top-level standard aliases

df0f315... by Chad Smith on 2018-08-27

default to /run/cloud-init/instance_data.json if not provided on render cli

8ede3d7... by Chad Smith on 2018-08-27

add read_cfg_paths helper for CLI tools

fbfeef6... by Chad Smith on 2018-08-27

use test module path in test failure reports instead of docstr

610512d... by Chad Smith on 2018-08-27

allow setupBasicLogging to check if a stderr handler is setup before resetting it.

44bb5f8... by Chad Smith on 2018-08-23

catch typeerror and undefinederror when rendering jinja templates to warn and skip a broken template file