diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:27:40 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:27:40 -0400 |
| commit | a27abb80969fd35dc150bcb2d9bddb7dbf98babe (patch) | |
| tree | bc26a38446caef49dc04b0c8535738a5a5ae4a37 | |
| parent | 72f826bff694b612d54b177635ca7e0dc83aed2f (diff) | |
| parent | c3ece3129228ad7f2206d049af0f4635da8e8eb5 (diff) | |
| download | vyos-cloud-init-a27abb80969fd35dc150bcb2d9bddb7dbf98babe.tar.gz vyos-cloud-init-a27abb80969fd35dc150bcb2d9bddb7dbf98babe.zip | |
fix ssh_pwauth behavior to function as documented.
Add option checking for ssh_pwauth to bring behavior inline with the
description cloud-config.txt example.
Previously, setting 'ssh_pwauth' to 'unchanged' or '' would result
in an empty value for PasswordAuthentication when it should have
simply not been modified.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_set_passwords.py | 19 |
2 files changed, 17 insertions, 4 deletions
@@ -90,6 +90,8 @@ for a user if they do not exist. (LP: #1539317) - dmi data: fix failure of reading dmi data for unset dmi values - doc: mention label for nocloud datasource must be 'cidata' [Peter Hurley] + - ssh_pwauth: fix module to support 'unchanged' and match behavior + described in documentation [Chris Cosby] 0.7.6: - open 0.7.6 diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 0c315361..58e1b713 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -45,8 +45,6 @@ def handle(_name, cfg, cloud, log, args): password = util.get_cfg_option_str(cfg, "password", None) expire = True - pw_auth = "no" - change_pwauth = False plist = None if 'chpasswd' in cfg: @@ -104,11 +102,24 @@ def handle(_name, cfg, cloud, log, args): change_pwauth = False pw_auth = None if 'ssh_pwauth' in cfg: - change_pwauth = True if util.is_true(cfg['ssh_pwauth']): + change_pwauth = True pw_auth = 'yes' - if util.is_false(cfg['ssh_pwauth']): + elif util.is_false(cfg['ssh_pwauth']): + change_pwauth = True pw_auth = 'no' + elif str(cfg['ssh_pwauth']).lower() == 'unchanged': + log.debug('Leaving auth line unchanged') + change_pwauth = False + elif not str(cfg['ssh_pwauth']).strip(): + log.debug('Leaving auth line unchanged') + change_pwauth = False + elif not cfg['ssh_pwauth']: + log.debug('Leaving auth line unchanged') + change_pwauth = False + else: + msg = 'Unrecognized value %s for ssh_pwauth' % cfg['ssh_pwauth'] + util.logexc(log, msg) if change_pwauth: replaced_auth = False |