summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/netinfo.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8735cee2..ca4b31fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
0.6.3:
- add sample systemd config files [Garrett Holmstrom]
- add Fedora support [Garrent Holstrom] (LP: #883286)
+ - fix bug in netinfo.debug_info if no net devices available (LP: #883367)
0.6.2:
- fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed
diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py
index 1b6af7e2..3ba922e8 100644
--- a/cloudinit/netinfo.py
+++ b/cloudinit/netinfo.py
@@ -63,7 +63,7 @@ def debug_info(pre="ci-info: "):
netdev = netdev_info()
except Exception as e:
lines.append("netdev_info failed!")
- netdev = []
+ netdev = {}
for (dev, d) in netdev.iteritems():
lines.append("%s%-6s: %i %-15s %-15s %s" %
(pre, dev, d["up"], d["addr"],d["mask"], d["hwaddr"]))