diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
| commit | eb29af61f9388de7a69bf7112193976dd4feb6db (patch) | |
| tree | 0a12d1de1bc6bb5527a3f99d01401df95250c0c7 /cloudinit/sources/DataSourceEc2.py | |
| parent | 4613bb45dde05cc859a0b4dec6587d80767b47c7 (diff) | |
| parent | 584b8434872322a9f617831742cc6b15977ecfbc (diff) | |
| download | vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.tar.gz vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.zip | |
merge from master at 0.7.8-45-g584b843
Diffstat (limited to 'cloudinit/sources/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 5 |
1 files changed, 5 insertions, 0 deletions
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)), |