Merge ~smoser/cloud-init:oracle-block-device-mapping into cloud-init:master

[Scott Moser]

[Ryan Harper (raharper)]

http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html

shows that it may be a list of dicts? Am I reading that right?

[Scott Moser (smoser)]

when you provide it you can give a list of dicts... in the metadata service it must come back as a dictionary (the code we have does items() on it, so it can't be a list).

see http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html

the way we crawl turns the 'block-device-mapping/' directory into a dictionary.

[Ryan Harper (raharper)]

On Tue, Nov 8, 2016 at 3:43 PM, Scott Moser <email address hidden> wrote:

> when you provide it you can give a list of dicts... in the metadata
> service it must come back as a dictionary (the code we have does items() on
> it, so it can't be a list).
>
> see http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-
> instance-metadata.html
>
> the way we crawl turns the 'block-device-mapping/' directory into a
> dictionary.
>

Ok, that makes sense, the "list" is the directory, and each entry is a dict
of config.

Approve.

>
>
> --
> https://code.launchpad.net/~smoser/cloud-init/+git/cloud-
> init/+merge/310371
> Your team cloud init development team is requested to review the proposed
> merge of ~smoser/cloud-init:oracle-block-device-mapping into
> cloud-init:master.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~cloud-init-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~cloud-init-dev
> More help : https://help.launchpad.net/ListHelp
>

[Ryan Harper (raharper)]

review: Approve

diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index bc84ef5..bb6d6fd 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -151,6 +151,10 @@ class DataSourceEc2(sources.DataSource):
         # 'root': '/dev/sda1'}
         found = None
         bdm = self.metadata['block-device-mapping']
+        if not isinstance(bdm, dict):
+            LOG.debug("block-device-mapping not a dictionary: '%s'", bdm)
+                return None
+
         for (entname, device) in bdm.items():
             if entname == name:
                 found = device