From 85d4fff9f7f7e8ffadca91258a25b5d2b3f43fd9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 17 Oct 2013 16:42:53 -0400 Subject: fix DataSourceAzure incompatibility with 2.6 LP: #1232175 --- ChangeLog | 1 + cloudinit/sources/DataSourceAzure.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 29ada343..042b5b25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a partitioned block device with target filesystem on ephemeral0.1. (LP: #1236594) + - fix DataSourceAzure incompatibility with 2.6 (LP: #1232175) 0.7.3: - fix omnibus chef installer (LP: #1182265) [Chris Wing] - small fix for OVF datasource for iso transport on non-iso9660 filesystem diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 8321dee0..b18c57e7 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -410,7 +410,7 @@ def read_azure_ovf(contents): simple = True value = child.childNodes[0].wholeText - attrs = {k: v for k, v in child.attributes.items()} + attrs = dict([(k, v) for k, v in child.attributes.items()]) # we accept either UserData or CustomData. If both are present # then behavior is undefined. -- cgit v1.2.3