summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_final_message.py3
-rw-r--r--cloudinit/config/cc_keys_to_console.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py
index 711e7b5b..b1caca47 100644
--- a/cloudinit/config/cc_final_message.py
+++ b/cloudinit/config/cc_final_message.py
@@ -55,7 +55,8 @@ def handle(_name, cfg, cloud, log, args):
'timestamp': ts,
'version': cver,
}
- util.multi_log("%s\n" % (templater.render_string(msg_in, subs)))
+ util.multi_log("%s\n" % (templater.render_string(msg_in, subs)),
+ console=False, stderr=True)
except Exception:
util.logexc(log, "Failed to render final message template")
diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py
index da7d5219..ed7af690 100644
--- a/cloudinit/config/cc_keys_to_console.py
+++ b/cloudinit/config/cc_keys_to_console.py
@@ -46,7 +46,8 @@ def handle(name, cfg, _cloud, log, _args):
cmd.append(','.join(fp_blacklist))
cmd.append(','.join(key_blacklist))
(stdout, _stderr) = util.subp(cmd)
- util.multi_log("%s\n" % (stdout.strip()), stderr=False)
+ util.multi_log("%s\n" % (stdout.strip()),
+ stderr=False, console=True)
except:
log.warn("Writing keys to the system console failed!")
raise