(mirror of https://github.com/vyos/vyos-cloud-init.git) https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling 2018-04-12T21:51:07+00:00 2018-04-12T21:51:07+00:00 Scott Moser smoser@ubuntu.com 2018-04-12T21:51:07+00:00 urn:sha1:4b86ab9a25b512420ecfe98953a3f3a6e4b4bba1 If a file passed to render_from_file had non-ascii text then jinja in python2 would decode as ascii, which would cause UnicodeDecodeError. This issue can be re-created in python2 with just: 'can\xe2\x80\x99t'.decode() The solution here is to explicitly pass in unicode supporting type (py3 str, py2 unicode). Those are six.text_type. Then jinja does not try to decode. The reason we hit this is that load_file calls decode_binary. decode_binary believes it has no work to do if it got a six.string_types. isinstance('can\xe2\x80\x99t', six.string_types) == True So it returns the original string which will blow up for jinja. Our fix here then is to load the file in binary mode and explicitly decode it to utf-8. Then in python2 we'll have a unicode type and in python3 we'll have a string type. 2018-04-12T19:32:25+00:00 Ryan Harper ryan.harper@canonical.com 2018-04-12T19:32:25+00:00 urn:sha1:c6dff581a9c253170d5e3f12fb83d16a8dec8257 Add a base NTP client configuration dictionary and allow Distro specific changes to be merged. Add a select client function which implements logic to preferr installed clients over clients which need to be installed. Also allow distributions to override the cloud-init defaults. LP: #1749722