From 4a9bfce6a5dedd7702507e8810c39677c532e42f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Sat, 16 Jun 2012 19:57:01 -0700 Subject: Remove default since it will never be called that way and apply default since its not currently being called that way --- cloudinit/ssh_util.py | 5 +---- cloudinit/transforms/ssh.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'cloudinit') 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: -- cgit v1.2.3