summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_keys_to_console.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-07-02 10:56:22 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-07-02 10:56:22 -0700
commit879946c26f005f5ae5c2bbdd537beb295d7f4773 (patch)
treed9036cd7fe1eee3cb5ce4510f4374a6bb7c95057 /cloudinit/config/cc_keys_to_console.py
parent8037b4723ad641701750f9b4c9b7d7216bf50838 (diff)
downloadvyos-cloud-init-879946c26f005f5ae5c2bbdd537beb295d7f4773.tar.gz
vyos-cloud-init-879946c26f005f5ae5c2bbdd537beb295d7f4773.zip
1. Move the welcome message template string to a constant at the top of the module
2. Fix the usage of multi_log to log to only one of the places (for now) 3. Update comment about multi-log and why write_file isn't used in this case
Diffstat (limited to 'cloudinit/config/cc_keys_to_console.py')
-rw-r--r--cloudinit/config/cc_keys_to_console.py3
1 files changed, 2 insertions, 1 deletions
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