summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-21 13:43:48 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-21 13:43:48 -0400
commit0a56e98326ea754a09c3f35339bba01dd8e893e2 (patch)
treeca4ad4ab2c4c4ad7a04e974ede9baae8c5ce45b7
parenta1b4d0d59e05b227f5dd2245ebd0e78c381a6e44 (diff)
downloadcloud-init-0a56e98326ea754a09c3f35339bba01dd8e893e2.tar.gz
no longer skip 'lo' elements when reading. pass 3rd test.
-rw-r--r--cloudinit/net/eni.py4
-rw-r--r--tests/unittests/test_net.py4
2 files changed, 2 insertions, 6 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index d963d1f2..1383dd6b 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -271,10 +271,6 @@ def _ifaces_to_net_config_data(ifaces):
for name, data in ifaces.items():
# devname is 'eth0' for name='eth0:1'
devname = name.partition(":")[0]
- if devname == "lo":
- # currently provding 'lo' in network config results in duplicate
- # entries. in rendered interfaces file. so skip it.
- continue
if devname not in devs:
devs[devname] = {'type': 'physical', 'name': devname,
'subnets': []}
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index f39fd97a..ee9061a9 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -167,8 +167,8 @@ iface eth1 inet static
RENDERED_ENI = """
auto lo
iface lo inet loopback
- dns-nameservers 10.0.0.1
- dns-search foo.com
+ dns-nameservers 10.0.0.1
+ dns-search foo.com
auto eth0
iface eth0 inet static