diff options
| author | Kim <kim.sidney@gmail.com> | 2021-03-29 04:49:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 04:49:48 -0700 |
| commit | f4e75241abf121b20e0063402bbc32087e8fdb4f (patch) | |
| tree | 1afd01e2d795c1a2b65f7830d059f3e49861fa30 | |
| parent | 70e34337b67b45fb3dbe35666e68279e3550c3e7 (diff) | |
| parent | 5b47d9dc1cd80e3dbd0fb21125febab2e99d5f9c (diff) | |
| download | vyos-cloud-init-f4e75241abf121b20e0063402bbc32087e8fdb4f.tar.gz vyos-cloud-init-f4e75241abf121b20e0063402bbc32087e8fdb4f.zip | |
Merge pull request #37 from UnicronNL/current
Metadata: T3432: Azure ssh keys not working for version 1.2.7/1.3.x u…
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 7fe01595..42b442fc 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -514,7 +514,8 @@ def handle(name, cfg, cloud, log, _args): # Prepare SSH public keys for default user, to be sure that global keys applied to the default account (if it exist) ssh_keys = metadata_v1['public_ssh_keys'] # append SSH keys from metadata_ds - if metadata_ds['public-keys']: + ds_keys = metadata_ds.get('public-keys') + if ds_keys: ssh_keys.extend([ key for key in metadata_ds['public-keys'] ]) # append SSH keys from cloud-config ssh_keys.extend(cfg.get('ssh_authorized_keys', [])) |