Merge lp:~jason-oldos/cloud-init/upgrade-configdrive into lp:~cloud-init-dev/cloud-init/trunk

[Jay Faulkner]

Upgraded DataSourceConfigDrive.py to support the most recent Openstack config drive revision.

This exposed a bug -- the vendor_data.json (added this version) was being parsed as yaml. This bug is fixed in this branch as well.

[lp:~jason-oldos/cloud-init/upgrade-configdrive]

1004. By Jay Faulkner on 2014-08-26

Add failback for older Openstack configdrive versions

- Also utilizing the constants defined in
  cloudinit/sources/helpers/openstack.py for configdrive versions

1005. By Jay Faulkner on 2014-08-26

Refactor vendor_data handling

vendor_data is guaranteed to be a dict if it exists; if it doesn't
exist ensure it's represented by an empty dict to avoid checking
it to see if it's a dict.

[lp:~jason-oldos/cloud-init/upgrade-configdrive]

1006. By Jay Faulkner on 2014-09-09

Update read_config_drive to use OS_VERSIONS tuple for readers

Updated read_config_drive: removed the unused version kwarg, used the
OS_VERSIONS tuple from the openstack helper to avoid hardcoding
versions.

Added a comment to the tuple in helpers/openstack.py asking for it to
be kept in chronological order.

1007. By Jay Faulkner on 2014-09-10

Only use vendordata under cloud-init key for ConfigDrive

This data will be treated the same as vendordata from other sources.

=== modified file 'cloudinit/sources/DataSourceConfigDrive.py'
--- cloudinit/sources/DataSourceConfigDrive.py	2014-02-25 01:17:07 +0000
+++ cloudinit/sources/DataSourceConfigDrive.py	2014-09-10 16:03:24 +0000
@@ -125,7 +125,14 @@
         self.userdata_raw = results.get('userdata')
         self.version = results['version']
         self.files.update(results.get('files', {}))
-        self.vendordata_raw = results.get('vendordata')
+
+        # If there is no vendordata, set vd to an empty dict instead of None
+        vd = results.get('vendordata', {})
+        # if vendordata includes 'cloud-init', then read that explicitly
+        # for cloud-init (for namespacing).
+        if 'cloud-init' in vd:
+            self.vendordata_raw = vd['cloud-init']
+
         return True
 
 
@@ -160,13 +167,17 @@
     return "net"
 
 
-def read_config_drive(source_dir, version="2012-08-10"):
+def read_config_drive(source_dir):
+    excps = []
+    finders = []
     reader = openstack.ConfigDriveReader(source_dir)
-    finders = [
-        (reader.read_v2, [], {'version': version}),
-        (reader.read_v1, [], {}),
-    ]
-    excps = []
+
+    # openstack.OS_VERSIONS is stored in chronological order, so to check the
+    # newest first, use reversed()
+    for version in reversed(openstack.OS_VERSIONS):
+        finders.append((reader.read_v2, [], {'version': version}))
+    finders.append((reader.read_v1, [], {}))
+
     for (functor, args, kwargs) in finders:
         try:
             return functor(*args, **kwargs)

=== modified file 'cloudinit/sources/helpers/openstack.py'
--- cloudinit/sources/helpers/openstack.py	2014-08-27 21:03:43 +0000
+++ cloudinit/sources/helpers/openstack.py	2014-09-10 16:03:24 +0000
@@ -48,6 +48,7 @@
 OS_FOLSOM = '2012-08-10'
 OS_GRIZZLY = '2013-04-04'
 OS_HAVANA = '2013-10-17'
+# keep this in chronological order by time: add new entries to the end
 OS_VERSIONS = (
     OS_FOLSOM,
     OS_GRIZZLY,