diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
| commit | 24365490c58df8f0ef2246838c81ec604f0311ac (patch) | |
| tree | 3a6e44277256d15bb215cef3c61799397a673e6e /cloudinit/config | |
| parent | f16b906c987c7a7948c9adad8f32c1f786ca6569 (diff) | |
| parent | 18bf614ca1d9fbabdf83495e7675a2cacaf6c2f4 (diff) | |
| download | vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.tar.gz vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.zip | |
merge trunk at 0.7.7~bzr1189
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_set_passwords.py | 19 |
1 files changed, 15 insertions, 4 deletions
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 |