summaryrefslogtreecommitdiff
path: root/cloudinit/net
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-15 23:28:51 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-15 23:28:51 -0400
commita066f95c67bb5fa15350cdff319f60d589274c3a (patch)
tree790d277e08dd39da82dd956c89709e17538a1a82 /cloudinit/net
parenta454a6408b3c7ecc816073049d060632191099bb (diff)
parentd598ceeb838b4ccaf667ded84bb02bf096ab7b12 (diff)
downloadvyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.tar.gz
vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.zip
merge with trunk
Diffstat (limited to 'cloudinit/net')
-rw-r--r--cloudinit/net/eni.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index c8adb1ae..ccd16ba7 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -389,8 +389,8 @@ class Renderer(renderer.Renderer):
iface['control'] = subnet.get('control', 'auto')
if iface['mode'].endswith('6'):
iface['inet'] += '6'
- elif (iface['mode'] == 'static'
- and ":" in subnet['address']):
+ elif (iface['mode'] == 'static' and
+ ":" in subnet['address']):
iface['inet'] += '6'
if iface['mode'].startswith('dhcp'):
iface['mode'] = 'dhcp'