diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:45:19 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:45:19 -0400 |
| commit | 7b4eef8f57ffb02c3851c7bfc36d614ebab8f341 (patch) | |
| tree | e7216eaf283bdcbe233939ccf1c154b90150fc49 /cloudinit/net | |
| parent | 150d064b5693c7a287790900923b9413fe6d73dd (diff) | |
| parent | 22a93665b90fa7fba80946d690330eda890f50d4 (diff) | |
| download | vyos-cloud-init-7b4eef8f57ffb02c3851c7bfc36d614ebab8f341.tar.gz vyos-cloud-init-7b4eef8f57ffb02c3851c7bfc36d614ebab8f341.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/net')
| -rw-r--r-- | cloudinit/net/__init__.py | 3 | ||||
| -rw-r--r-- | cloudinit/net/eni.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py index 63e54f91..21cc602b 100644 --- a/cloudinit/net/__init__.py +++ b/cloudinit/net/__init__.py @@ -252,7 +252,8 @@ def _rename_interfaces(renames, strict_present=True, strict_busy=True, cur_bymac[mac] = cur def update_byname(bymac): - return {data['name']: data for data in bymac.values()} + return dict((data['name'], data) + for data in bymac.values()) def rename(cur, new): util.subp(["ip", "link", "set", cur, "name", new], capture=True) diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py index cdcc951b..eff5b924 100644 --- a/cloudinit/net/eni.py +++ b/cloudinit/net/eni.py @@ -62,7 +62,7 @@ def _iface_add_subnet(iface, subnet): value = " ".join(value) if '_' in key: key = key.replace('_', '-') - content.append(" {} {}".format(key, value)) + content.append(" {0} {1}".format(key, value)) return sorted(content) @@ -95,7 +95,7 @@ def _iface_add_attrs(iface, index): continue if type(value) == list: value = " ".join(value) - content.append(" {} {}".format(renames.get(key, key), value)) + content.append(" {0} {1}".format(renames.get(key, key), value)) return sorted(content) |