5 files changed, 9 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceAliYun.py b/cloudinit/sources/DataSourceAliYun.py
index 19957212..535813ab 100644
--- a/cloudinit/sources/DataSourceAliYun.py
+++ b/cloudinit/sources/DataSourceAliYun.py
@@ -38,6 +38,7 @@ def parse_public_keys(public_keys):
                 keys.extend(key)
     return keys
 
+
 # Used to match classes to dependencies
 datasources = [
     (DataSourceAliYun, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py
index 20345389..fac7bbcc 100644
--- a/cloudinit/sources/DataSourceAltCloud.py
+++ b/cloudinit/sources/DataSourceAltCloud.py
@@ -270,6 +270,7 @@ class DataSourceAltCloud(sources.DataSource):
         else:
             return False
 
+
 # Used to match classes to dependencies
 # Source DataSourceAltCloud does not really depend on networking.
 # In the future 'dsmode' like behavior can be added to offer user
diff --git a/cloudinit/sources/DataSourceBigstep.py b/cloudinit/sources/DataSourceBigstep.py
index f80956a5..e8fd0088 100644
--- a/cloudinit/sources/DataSourceBigstep.py
+++ b/cloudinit/sources/DataSourceBigstep.py
@@ -46,6 +46,7 @@ def get_url_from_file():
             raise
     return content
 
+
 # Used to match classes to dependencies
 datasources = [
     (DataSourceBigstep, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index bc84ef5d..acbc2356 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
@@ -198,6 +202,7 @@ class DataSourceEc2(sources.DataSource):
             return az[:-1]
         return None
 
+
 # Used to match classes to dependencies
 datasources = [
     (DataSourceEc2, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
index 6c12d703..5ed59559 100644
--- a/cloudinit/sources/DataSourceGCE.py
+++ b/cloudinit/sources/DataSourceGCE.py
@@ -156,6 +156,7 @@ class DataSourceGCE(sources.DataSource):
     def region(self):
         return self.availability_zone.rsplit('-', 1)[0]
 
+
 # Used to match classes to dependencies
 datasources = [
     (DataSourceGCE, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),