diff options
| author | zsdc <taras@vyos.io> | 2021-04-03 01:12:04 +0300 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2021-04-03 01:12:04 +0300 |
| commit | 48ee31b8b99c8dced5fa667946949045dceb577c (patch) | |
| tree | b5b91db231ba65bec7887f4acb5cce2b8a11e336 /cloudinit/config/cc_vyos.py | |
| parent | 4b38aa2ff697e04154243b68e7527010a702e1f5 (diff) | |
| download | vyos-cloud-init-48ee31b8b99c8dced5fa667946949045dceb577c.tar.gz vyos-cloud-init-48ee31b8b99c8dced5fa667946949045dceb577c.zip | |
Azure: T3432: Reverted changes for appending public-keys
This commit reverts the 5b47d9dc1cd80e3dbd0fb21125febab2e99d5f9c and 57e53d13ad772a74f55c38d95f6d61623fe08633 since Cloud-init 20.4 is not affected by the problem.
Diffstat (limited to 'cloudinit/config/cc_vyos.py')
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index e632b1fa..cbe29811 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -514,10 +514,6 @@ def handle(name, cfg, cloud, log, _args): # configure system logins # 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 - 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', [])) # Configure authentication for default user account |