From a2aa4805f018a9d8ff8baff7c2f6cb91e532c4d2 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Sun, 30 Oct 2011 18:00:41 -0400 Subject: Make the types of SSH keys to generate configurable Notes: * This also makes cc_ssh.py *not* write ssh keys to the console. That means that if keys-to-console is configured off, nothing will write the keys to the console. * I removed Garret's use of xargs, replacing with a shell for loop in write-ssh-key-fingerprints. taken from git://pkgs.fedoraproject.org/cloud-init.git commit 87f33190f43d2b26cced4597e7298835024466c2 Author: Garrett Holmstrom Patch8: cloud-init-0.6.2-sshkeytypes.patch --- cloudinit/util.py | 1 + 1 file changed, 1 insertion(+) (limited to 'cloudinit/util.py') diff --git a/cloudinit/util.py b/cloudinit/util.py index 744fb71e..0c457128 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -84,6 +84,7 @@ def get_cfg_option_str(yobj, key, default=None): def get_cfg_option_list_or_str(yobj, key, default=None): if not yobj.has_key(key): return default + if yobj[key] is None: return [] if isinstance(yobj[key],list): return yobj[key] return([yobj[key]]) -- cgit v1.2.3