cloud-init-dev team mailing list archive

[Guido Günther <agx@xxxxxxxxxxx>]

Guido Günther has proposed merging lp:~agx/cloud-init/nocloud into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~agx/cloud-init/nocloud/+merge/276426

nocloud: Make sure ds_cfg is not None
  
otherwise this barfs when accessing it for the first time in get_data().
This is modelled like the DataSourceOpenStack.

-- 
Your team cloud init development team is requested to review the proposed merge of lp:~agx/cloud-init/nocloud into lp:cloud-init.

=== modified file 'cloudinit/sources/DataSourceNoCloud.py'
--- cloudinit/sources/DataSourceNoCloud.py	2015-09-08 18:26:30 +0000
+++ cloudinit/sources/DataSourceNoCloud.py	2015-11-02 17:12:15 +0000
@@ -38,6 +38,9 @@
         self.cmdline_id = "ds=nocloud"
         self.seed_dir = os.path.join(paths.seed_dir, 'nocloud')
         self.supported_seed_starts = ("/", "file://")
+        if not self.ds_cfg:
+            self.ds_cfg = {}
+
 
     def __str__(self):
         root = sources.DataSource.__str__(self)