diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-19 08:22:30 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-19 08:22:30 -0400 |
| commit | a904de054f7818137c864e0f3ff728b3764cf457 (patch) | |
| tree | e28f4807469f2c39554d4353bf11685c03a1b4aa /cloudinit/config/cc_ssh.py | |
| parent | 204e79b93c882e17df63b24f7f682c0dbefb482d (diff) | |
| parent | ae0f94c8f39a234d73ab8e2caf24d73439c8b5ee (diff) | |
| download | vyos-cloud-init-a904de054f7818137c864e0f3ff728b3764cf457.tar.gz vyos-cloud-init-a904de054f7818137c864e0f3ff728b3764cf457.zip | |
merge from trunk at revno 799
Diffstat (limited to 'cloudinit/config/cc_ssh.py')
| -rw-r--r-- | cloudinit/config/cc_ssh.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py index b623d476..7ef20d9f 100644 --- a/cloudinit/config/cc_ssh.py +++ b/cloudinit/config/cc_ssh.py @@ -126,7 +126,7 @@ def apply_credentials(keys, user, disable_root, disable_root_opts): keys = set(keys) if user: - ssh_util.setup_user_keys(keys, user, '') + ssh_util.setup_user_keys(keys, user) if disable_root: if not user: @@ -135,4 +135,4 @@ def apply_credentials(keys, user, disable_root, disable_root_opts): else: key_prefix = '' - ssh_util.setup_user_keys(keys, 'root', key_prefix) + ssh_util.setup_user_keys(keys, 'root', options=key_prefix) |