diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:39 -0400 |
| commit | 90de5dfa9685a9585b651c38b21274a9aa05ec38 (patch) | |
| tree | 238e33b0122e68154bc5773186b5938bac2fe34f /cloudinit/ssh_util.py | |
| parent | 0ec34747b61845bfce806065dd126dcb56fe4672 (diff) | |
| parent | 5db46cfb68422b0c14d4a6c097553edd0016de3f (diff) | |
| download | vyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.tar.gz vyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.zip | |
merge trunk at 0.7.7~bzr1176
Diffstat (limited to 'cloudinit/ssh_util.py')
| -rw-r--r-- | cloudinit/ssh_util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py index 9b2f5ed5..c74a7ae2 100644 --- a/cloudinit/ssh_util.py +++ b/cloudinit/ssh_util.py @@ -31,7 +31,8 @@ LOG = logging.getLogger(__name__) DEF_SSHD_CFG = "/etc/ssh/sshd_config" # taken from openssh source key.c/key_type_from_name -VALID_KEY_TYPES = ("rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa", +VALID_KEY_TYPES = ( + "rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa", "ssh-rsa-cert-v00@openssh.com", "ssh-dss-cert-v00@openssh.com", "ssh-rsa-cert-v00@openssh.com", "ssh-dss-cert-v00@openssh.com", "ssh-rsa-cert-v01@openssh.com", "ssh-dss-cert-v01@openssh.com", |