diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-09-26 10:50:20 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-09-26 10:50:20 -0400 |
| commit | 356f5f434d3712fbfddc09d614eedfdb6ebe63a4 (patch) | |
| tree | d32b28b317794817f080e463ae7c1e08c8e885c0 /cloudinit/config | |
| parent | b55a9606e9455056a4280b06ef3785964af6d3df (diff) | |
| parent | 4063358ec2f20bcff4328fb659cecbed668a9a48 (diff) | |
| download | vyos-cloud-init-356f5f434d3712fbfddc09d614eedfdb6ebe63a4.tar.gz vyos-cloud-init-356f5f434d3712fbfddc09d614eedfdb6ebe63a4.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_final_message.py | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_ssh_authkey_fingerprints.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py index 6b864fda..e92cba4a 100644 --- a/cloudinit/config/cc_final_message.py +++ b/cloudinit/config/cc_final_message.py @@ -54,7 +54,7 @@ def handle(_name, cfg, cloud, log, args): 'datasource': str(cloud.datasource), } util.multi_log("%s\n" % (templater.render_string(msg_in, subs)), - console=False, stderr=True) + console=False, stderr=True, log=log) except Exception: util.logexc(log, "Failed to render final message template") diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py index c38bcea2..be8083db 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -63,7 +63,7 @@ def _is_printable_key(entry): def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5', prefix='ci-info: '): if not key_entries: - message = ("%sno authorized ssh keys fingerprints found for user %s." + message = ("%sno authorized ssh keys fingerprints found for user %s.\n" % (prefix, user)) util.multi_log(message) return |