diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-01 14:56:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-01 14:56:55 -0500 |
| commit | ff0a34876dc0ce29b762ffd7fcdbfa80308e5aae (patch) | |
| tree | 3e83f7944c702580f276f545a48ac69016e14f1e /cloudinit/config | |
| parent | ceec6724143e950d6ceb9ea0758dbfd1ad33921a (diff) | |
| download | vyos-cloud-init-ff0a34876dc0ce29b762ffd7fcdbfa80308e5aae.tar.gz vyos-cloud-init-ff0a34876dc0ce29b762ffd7fcdbfa80308e5aae.zip | |
change parser.parse 'default_opts' to 'options'
Now, parser.parse specifies options that override any options found,
rather than just being default options.
There could still potentially be a user for default_options, but since we're
not using them anywhere, I've dropped it. The difference is that in setting up
the root user, we're now insisting that all keys that go in there have the
key_prefix, even if the key content had other options.
I think this is actually the commit that fixes LP: #1136343.
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) |