diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-16 19:57:01 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-16 19:57:01 -0700 |
| commit | 4a9bfce6a5dedd7702507e8810c39677c532e42f (patch) | |
| tree | 3978d1d025eb3b8605446a3be62f75ea3b242e7b /cloudinit | |
| parent | 84abafd991389c533b40f00ab2fec76f744a2275 (diff) | |
| download | vyos-cloud-init-4a9bfce6a5dedd7702507e8810c39677c532e42f.tar.gz vyos-cloud-init-4a9bfce6a5dedd7702507e8810c39677c532e42f.zip | |
Remove default since it will never be called that way and apply default since its not currently being called that way
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/ssh_util.py | 5 | ||||
| -rw-r--r-- | cloudinit/transforms/ssh.py | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py index d58707d0..13adbb09 100644 --- a/cloudinit/ssh_util.py +++ b/cloudinit/ssh_util.py @@ -210,10 +210,7 @@ def update_authorized_keys(fname, keys): return '\n'.join(lines) -def setup_user_keys(keys, user, key_prefix, sshd_config_fn=None): - if not sshd_config_fn: - sshd_config_fn = DEF_SSHD_CFG - +def setup_user_keys(keys, user, key_prefix, sshd_config_fn=DEF_SSHD_CFG): pwent = pwd.getpwnam(user) ssh_dir = os.path.join(pwent.pw_dir, '.ssh') if not os.path.exists(ssh_dir): diff --git a/cloudinit/transforms/ssh.py b/cloudinit/transforms/ssh.py index f5c22e28..b1f2ce89 100644 --- a/cloudinit/transforms/ssh.py +++ b/cloudinit/transforms/ssh.py @@ -112,8 +112,7 @@ def handle(_name, cfg, cloud, log, _args): util.logexc(log, "Applying ssh credentials failed!") -def apply_credentials(keys, user, disable_root, - disable_root_opts=DISABLE_ROOT_OPTS): +def apply_credentials(keys, user, disable_root, disable_root_opts): keys = set(keys) if user: |