diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
| commit | 575a084808db7d5ac607a848b018abe676e73a91 (patch) | |
| tree | 34e179b0623074e6cd6fc03e4b3db001f8e493bf /cloudinit/config/cc_ssh_authkey_fingerprints.py | |
| parent | 9dfb60d3144860334ab1ad1d72920d962139461f (diff) | |
| parent | d4886b65549c886499141872a9928412a74bbea2 (diff) | |
| download | vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.tar.gz vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.zip | |
Update to code on trunk.
Diffstat (limited to 'cloudinit/config/cc_ssh_authkey_fingerprints.py')
| -rw-r--r-- | cloudinit/config/cc_ssh_authkey_fingerprints.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py index 8c9a8806..c38bcea2 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -97,9 +97,8 @@ def handle(name, cfg, cloud, log, _args): "logging of ssh fingerprints disabled"), name) hash_meth = util.get_cfg_option_str(cfg, "authkey_hash", "md5") - extract_func = ssh_util.extract_authorized_keys (users, _groups) = ds.normalize_users_groups(cfg, cloud.distro) for (user_name, _cfg) in users.items(): - (auth_key_fn, auth_key_entries) = extract_func(user_name, cloud.paths) - _pprint_key_entries(user_name, auth_key_fn, - auth_key_entries, hash_meth) + (key_fn, key_entries) = ssh_util.extract_authorized_keys(user_name) + _pprint_key_entries(user_name, key_fn, + key_entries, hash_meth) |