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
This commit is contained in:
Scott Moser
2014-08-26 12:25:50 -04:00
parent e89bdd0c6a
commit 9ebaceca86
2 changed files with 4 additions and 1 deletions

View File

@@ -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

View File

@@ -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)