diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 21:09:45 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 21:09:45 -0400 |
| commit | 333130a7ac9df5e698d82dec2cb6e8e44ba1432b (patch) | |
| tree | 0dd495cdf7b063527a147d2f0b6e9f6be5442f75 /cloudinit/net | |
| parent | 4f989cc595775ab6b06fac604218d77910f3e4f4 (diff) | |
| parent | 412d5d34c424da0f5c291e9f9e706098c541017c (diff) | |
| download | vyos-cloud-init-333130a7ac9df5e698d82dec2cb6e8e44ba1432b.tar.gz vyos-cloud-init-333130a7ac9df5e698d82dec2cb6e8e44ba1432b.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/net')
| -rw-r--r-- | cloudinit/net/eni.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py index a695f5ed..5a90eb32 100644 --- a/cloudinit/net/eni.py +++ b/cloudinit/net/eni.py @@ -391,8 +391,8 @@ class Renderer(object): 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' |