summaryrefslogtreecommitdiff
path: root/cloudinit/net/netplan.py
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2020-01-08 11:30:17 -0600
committerChad Smith <chad.smith@canonical.com>2020-01-08 10:30:17 -0700
commitdacdd30080bd8183d1f1c1dc9dbcbc8448301529 (patch)
treeba79741418d3fb6f5c779fe37674263a3545c131 /cloudinit/net/netplan.py
parent6aa14766a7039333aac6f75dc442fa58dc4e692f (diff)
downloadvyos-cloud-init-dacdd30080bd8183d1f1c1dc9dbcbc8448301529.tar.gz
vyos-cloud-init-dacdd30080bd8183d1f1c1dc9dbcbc8448301529.zip
net: fix rendering of 'static6' in network config (#77)
* net: fix rendering of 'static6' in network config A V1 static6 network typo was misrendered in eni, it's not valid. It was ignored in sysconfig and netplan. This branch fixes eni, updates sysconfig, netplan to render it correctly and adds unittests for all cases. Reported-by: Raphaƫl Enrici LP: #1850988 * net: add comment about static6 type in subnet_is_ipv6 Co-authored-by: Chad Smith <blackboxsw@gmail.com> Co-authored-by: Daniel Watkins <daniel@daniel-watkins.co.uk>
Diffstat (limited to 'cloudinit/net/netplan.py')
-rw-r--r--cloudinit/net/netplan.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index 14d3999f..89855270 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -98,7 +98,7 @@ def _extract_addresses(config, entry, ifname, features=None):
entry.update({sn_type: True})
elif sn_type in IPV6_DYNAMIC_TYPES:
entry.update({'dhcp6': True})
- elif sn_type in ['static']:
+ elif sn_type in ['static', 'static6']:
addr = "%s" % subnet.get('address')
if 'prefix' in subnet:
addr += "/%d" % subnet.get('prefix')