diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2015-04-20 15:24:22 +0100 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2015-04-20 15:24:22 +0100 |
| commit | 4fc65f02ae3fbf1a2062e6169ee39b5c5d5e23bc (patch) | |
| tree | 0c948074b8d1cdd139da1b3ecc1b556d4880bf55 /cloudinit/sources/DataSourceGCE.py | |
| parent | 6e84c05d2dc402de8cc4ae414af8657b97317218 (diff) | |
| download | vyos-cloud-init-4fc65f02ae3fbf1a2062e6169ee39b5c5d5e23bc.tar.gz vyos-cloud-init-4fc65f02ae3fbf1a2062e6169ee39b5c5d5e23bc.zip | |
GCE instance-level SSH keys override project-level keys. (LP: #1403617)
Diffstat (limited to 'cloudinit/sources/DataSourceGCE.py')
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index 1a133c28..f4ed915d 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -80,7 +80,8 @@ class DataSourceGCE(sources.DataSource): ('instance-id', ('instance/id',), True, True), ('availability-zone', ('instance/zone',), True, True), ('local-hostname', ('instance/hostname',), True, True), - ('public-keys', ('project/attributes/sshKeys',), False, True), + ('public-keys', ('project/attributes/sshKeys', + 'instance/attributes/sshKeys'), False, True), ('user-data', ('instance/attributes/user-data',), False, False), ('user-data-encoding', ('instance/attributes/user-data-encoding',), False, True), |