Merge lp:~agx/cloud-init/nocloud into lp:~cloud-init-dev/cloud-init/trunk

[Guido Günther]

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.

[Scott Moser (smoser)]

Hi,
I've just committed revision 1194 to trunk that should fix this for you.
Now the base DataSource class sets ds_cfg to a {} rather than None if it was set. so you should only ever get it as a dictionary.

[Guido Günther (agx)]

On Mon, Apr 04, 2016 at 04:41:11PM -0000, Scott Moser wrote:
> The proposal to merge lp:~agx/cloud-init/nocloud into lp:cloud-init has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~agx/cloud-init/nocloud/+merge/276426

Thanks a lot!
 -- Guido

=== 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)