diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-18 01:38:27 -0500 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-18 01:38:27 -0500 |
| commit | 671493a26966b179ecc09ce222b987fbc5376fe2 (patch) | |
| tree | 9e1fe1dd8b4b147268d716b09cfca22a3bdd7df3 /cloudinit/config | |
| parent | 16a44056eaa5cc36fd9f6b08fe3a6bb4700fe1e7 (diff) | |
| parent | 56402e91e95960f54a39eb18cbda391f00f95b6e (diff) | |
| download | vyos-cloud-init-671493a26966b179ecc09ce222b987fbc5376fe2.tar.gz vyos-cloud-init-671493a26966b179ecc09ce222b987fbc5376fe2.zip | |
Merge from trunk
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 |