DataSourceOpenStack: allow vendor-data to be a dict with 'cloud-init' inside

smoser · smoser · commit b812776fcccd · 2014-02-14T14:24:06.000-05:00
There might be multiple things to put inside a vendor-data.
So, if it is a dict and that dict has 'cloud-init', assume that the whole
thing was not meant for cloud-init, and set vendordata_raw to the specific
item.
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
@@ -142,7 +142,15 @@ def get_data(self):
         self.userdata_raw = results.get('userdata')
         self.version = results['version']
         self.files.update(results.get('files', {}))
-        self.vendordata_raw = results.get('vendordata')
+
+        # if vendordata includes 'cloud-init', then read that explicitly
+        # for cloud-init (for namespacing).
+        vd = results.get('vendordata')
+        if isinstance(vd, dict) and 'cloud-init' in vd:
+            self.vendordata_raw = vd['cloud-init']
+        else:
+            self.vendordata_raw = vd
+
         return True
 
 
