diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-08-26 12:25:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-26 12:25:50 -0400 |
| commit | 190cacc430900d9d2dd4dd45c59d01e30e469720 (patch) | |
| tree | 541d59e56be7b628f1a73e7762d2eb233bb216c3 | |
| parent | d723c17b7abe5263d879d748dade763034cce476 (diff) | |
| download | vyos-cloud-init-190cacc430900d9d2dd4dd45c59d01e30e469720.tar.gz vyos-cloud-init-190cacc430900d9d2dd4dd45c59d01e30e469720.zip | |
ssh_authkey_fingerprints: fix bug that prevented disabling the module
Module intended to allow disabling by configuration, but that was broken.
Now this allows:
no_ssh_fingerprints = True
LP: #1340903
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_ssh_authkey_fingerprints.py | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -23,6 +23,8 @@ unless config explicitly provided (LP: #1329583) [Garrett Holmstrom]) - fix rendering resolv.conf if no 'options' are provided (LP: #1328953) - docs: fix disk-setup to reference 'table_type' [Rail Aliiev] (LP: #1313114) + - ssh_authkey_fingerprints: fix bug that prevented disabling the module. + (LP: #1340903) [Patrick Lucas] 0.7.5: - open 0.7.5 - Add a debug log message around import failures diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py index be8083db..7da62589 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -92,9 +92,10 @@ def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5', def handle(name, cfg, cloud, log, _args): - if 'no_ssh_fingerprints' in cfg: + if util.is_true(cfg.get('no_ssh_fingerprints', False)): log.debug(("Skipping module named %s, " "logging of ssh fingerprints disabled"), name) + return hash_meth = util.get_cfg_option_str(cfg, "authkey_hash", "md5") (users, _groups) = ds.normalize_users_groups(cfg, cloud.distro) |