x/cloud-init
Code Issues Proposed changes

Also allow a dict to be used

Browse Source 
When a dict is passed in for 'ssh_authorized_keys' just extract
the keys from the values of the dict (and discard the keys).
This commit is contained in:
Joshua Harlow 2014-10-21 12:00:53 -07:00
parent 9902b4e9e3
commit 29d3c6578b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudinit/distros/__init__.py
View File

@ -391,10 +391,12 @@ class Distro(object):
keys = kwargs['ssh_authorized_keys'] keys = kwargs['ssh_authorized_keys']
if isinstance(keys, (basestring, str)): if isinstance(keys, (basestring, str)):
keys = [keys] keys = [keys]
if isinstance(keys, dict):
keys = list(keys.values())
if not isinstance(keys, (tuple, list, set)): if not isinstance(keys, (tuple, list, set)):
util.multi_log("Invalid type detected for" util.multi_log("Invalid type detected for"
" 'ssh_authorized_keys', expected list, string" " 'ssh_authorized_keys', expected list, string"
" or set.") " , dict, or set.")
else: else:
keys = set(keys) or [] keys = set(keys) or []
ssh_util.setup_user_keys(keys, name, options=None) ssh_util.setup_user_keys(keys, name, options=None)