add supprot for reading public-keys from DataSourcMAAS

smoser · smoser · commit 6d8f796239ed · 2012-03-16T13:14:27.000-04:00
diff --git a/cloudinit/DataSourceMAAS.py b/cloudinit/DataSourceMAAS.py
@@ -139,7 +139,7 @@ def read_maas_seed_dir(seed_d):
       * local-hostname
       * user-data
     """
-    files = ('local-hostname', 'instance-id', 'user-data')
+    files = ('local-hostname', 'instance-id', 'user-data', 'public-keys')
     md = {}
 
     if not os.path.isdir(seed_d):
@@ -165,11 +165,14 @@ def read_maas_seed_url(seed_url, header_cb=None, timeout=None,
     be given to urllib2.Request()
 
     Expected format of seed_url is are the following files:
-      * <seed_url>/<version>/instance-id
-      * <seed_url>/<version>/local-hostname
+      * <seed_url>/<version>/meta-data/instance-id
+      * <seed_url>/<version>/meta-data/local-hostname
       * <seed_url>/<version>/user-data
     """
-    files = ('meta-data/local-hostname', 'meta-data/instance-id', 'user-data')
+    files = ('meta-data/local-hostname',
+             'meta-data/instance-id',
+             'meta-data/public-keys',
+             'user-data')
 
     base_url = "%s/%s" % (seed_url, version)
     md = {}
diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py
@@ -29,7 +29,8 @@ def test_seed_dir_valid(self):
 
         data = {'instance-id': 'i-valid01',
             'local-hostname': 'valid01-hostname',
-            'user-data': 'valid01-userdata'}
+            'user-data': 'valid01-userdata',
+            'public-keys': 'ssh-rsa AAAAB3Nz...aC1yc2E= keyname'}
 
         my_d = os.path.join(self.tmp, "valid")
         populate_dir(my_d, data)
@@ -99,6 +100,7 @@ def test_seed_url_valid(self):
         """Verify that valid seed_url is read as such"""
         valid = {'meta-data/instance-id': 'i-instanceid',
             'meta-data/local-hostname': 'test-hostname',
+            'meta-data/public-keys': 'test-hostname',
             'user-data': 'foodata'}
 
         my_seed = "http://example.com/xmeta"
