x/cloud-init
Code Issues Proposed changes

Use LOG.warn and handle the None case as well

Browse Source
This commit is contained in:
Joshua Harlow 2014-10-21 12:23:09 -07:00
parent 432dbe94ca
commit ef24239f70
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloudinit/distros/__init__.py
View File

@ -393,13 +393,14 @@ class Distro(object):
keys = [keys]
if isinstance(keys, dict):
keys = list(keys.values())
if not isinstance(keys, (tuple, list, set)):
util.multi_log("Invalid type detected for"
" 'ssh_authorized_keys', expected list, string"
", dict, or set.")
else:
keys = set(keys) or []
ssh_util.setup_user_keys(keys, name, options=None)
if keys is not None:
if not isinstance(keys, (tuple, list, set)):
LOG.warn("Invalid type '%s' detected for"
" 'ssh_authorized_keys', expected list,"
" string, dict, or set.", type(keys))
else:
keys = set(keys) or []
ssh_util.setup_user_keys(keys, name, options=None)
return True