diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2018-10-23 23:36:27 +0200 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2018-10-23 23:36:27 +0200 |
| commit | 9967bc76410b7ecddc6d02411cd3bda08a5a7b9a (patch) | |
| tree | ca2e8fd927c0adac75ddd77bbaade85e3d2a24c3 /cloudinit/config/cc_vyos.py | |
| parent | 28f66957d027264260e7b82616ffc9e7b67616e7 (diff) | |
| download | vyos-cloud-init-9967bc76410b7ecddc6d02411cd3bda08a5a7b9a.tar.gz vyos-cloud-init-9967bc76410b7ecddc6d02411cd3bda08a5a7b9a.zip | |
Use dhcp for google cloud source
Rework check to see which part of ssh key is which
Diffstat (limited to 'cloudinit/config/cc_vyos.py')
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index b073239c..290d3665 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -20,7 +20,6 @@ import os import sys -import base64 import ast from cloudinit import util @@ -58,11 +57,9 @@ def set_ssh_login(config, user, key_string, key_x): for key in key_parts: if 'ssh-dss' in key or 'ssh-rsa' in key: key_type = key - try: - if base64.b64decode(key): - key_data = key - except: - pass + + if key.startswith('AAAAB3NzaC1yc2E') or key.startswith('AAAAB3NzaC1kc3M'): + key_data = key if not key_type: util.logexc(log, 'Key type not defined, wrong ssh key format.') |