diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-04 15:13:15 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-04 15:13:15 -0500 |
| commit | c1625a5f90d4f08b193e4fcfc3238bb32bcf61df (patch) | |
| tree | 5032f10e7380ee998cebba1c90bca2db7cb3e339 /cloudinit/config | |
| parent | 7bb938c0a677637796ee62fc4242d8c0118987bd (diff) | |
| parent | 2a64b4e7a702933ec5e5a726155cc7acbe4d8144 (diff) | |
| download | vyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.tar.gz vyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config')
| -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) |