diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-02-11 14:00:20 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-02-11 14:00:20 -0500 |
| commit | 35dd98c07bce490e85e03bef872cbbf1185e0be9 (patch) | |
| tree | 9b71de77b27ca916fa1d869fa95c0a5ab9f5e51c /cloudinit/config/cc_final_message.py | |
| parent | cd632b2f153a61faa48531cb41d0288650e72c71 (diff) | |
| parent | 587387cfbff7a89573128dc958df903d1becbde1 (diff) | |
| download | vyos-cloud-init-35dd98c07bce490e85e03bef872cbbf1185e0be9.tar.gz vyos-cloud-init-35dd98c07bce490e85e03bef872cbbf1185e0be9.zip | |
some python3 fixes
This fixes the last set of WARN messages in my testing.
* open /dev/console in text mode
* move final message to be jinja template by default to avoid
a warning about lack of cheetah.
* write and read pickle'd contents in binary
* some logging tests
Also:
* add tool tox-venv for simple things like:
tox-venv py34 /bin/bash
Diffstat (limited to 'cloudinit/config/cc_final_message.py')
| -rw-r--r-- | cloudinit/config/cc_final_message.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py index b24294e4..ad957e12 100644 --- a/cloudinit/config/cc_final_message.py +++ b/cloudinit/config/cc_final_message.py @@ -26,9 +26,12 @@ from cloudinit.settings import PER_ALWAYS frequency = PER_ALWAYS -# Cheetah formated default message -FINAL_MESSAGE_DEF = ("Cloud-init v. ${version} finished at ${timestamp}." - " Datasource ${datasource}. Up ${uptime} seconds") +# Jinja formated default message +FINAL_MESSAGE_DEF = ( + "## template: jinja\n" + "Cloud-init v. {{version}} finished at {{timestamp}}." + " Datasource {{datasource}}. Up {{uptime}} seconds" +) def handle(_name, cfg, cloud, log, args): |