From 1676825c229e3939ec5b06c494bdcb56d39dddb1 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 1 Mar 2012 11:14:31 -0500
Subject: return public-keys as a list if it is a list

if public-keys in metadata are a list (rather than a dict), then
return them as such.

This allows populating NoCloud keys with:
public-keys:
 - ssh-rsa .... myname.mylabel
 - ssh-dsa .... myname.mylabel2

Or:
cat <<EOF
public-keys:
$(ssh-add -L | sed 's,^\(.*\), - "\1",')
EOF
---
 cloudinit/DataSource.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'cloudinit/DataSource.py')

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
-- 
cgit v1.2.3