diff options
author | Cosmin Luță <cosmin.luta@avira.com> | 2012-03-04 16:36:23 +0200 |
---|---|---|
committer | Cosmin Luță <cosmin.luta@avira.com> | 2012-03-04 16:36:23 +0200 |
commit | 131ca40e5e4770ef8536098863599a0cac157a3f (patch) | |
tree | 6a2b0e21d8e6df80ad156d84aed29117d1477bb0 /cloudinit/DataSource.py | |
parent | 15648e327ad19c8332ab770698643c0e0335bc28 (diff) | |
parent | 1676825c229e3939ec5b06c494bdcb56d39dddb1 (diff) | |
download | vyos-cloud-init-131ca40e5e4770ef8536098863599a0cac157a3f.tar.gz vyos-cloud-init-131ca40e5e4770ef8536098863599a0cac157a3f.zip |
Merge from main branch
Diffstat (limited to 'cloudinit/DataSource.py')
-rw-r--r-- | cloudinit/DataSource.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/DataSource.py b/cloudinit/DataSource.py index f38e3b20..1bcb9c10 100644 --- a/cloudinit/DataSource.py +++ b/cloudinit/DataSource.py @@ -72,6 +72,9 @@ class DataSource: if isinstance(self.metadata['public-keys'], str): return([self.metadata['public-keys'], ]) + if isinstance(self.metadata['public-keys'], list): + return(self.metadata['public-keys']) + for _keyname, klist in self.metadata['public-keys'].items(): # lp:506332 uec metadata service responds with # data that makes boto populate a string for 'klist' rather |