diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2020-01-08 11:30:17 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2020-01-08 10:30:17 -0700 |
| commit | dacdd30080bd8183d1f1c1dc9dbcbc8448301529 (patch) | |
| tree | ba79741418d3fb6f5c779fe37674263a3545c131 /cloudinit/net/eni.py | |
| parent | 6aa14766a7039333aac6f75dc442fa58dc4e692f (diff) | |
| download | vyos-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/eni.py')
| -rw-r--r-- | cloudinit/net/eni.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py index 70771060..2f714563 100644 --- a/cloudinit/net/eni.py +++ b/cloudinit/net/eni.py @@ -429,7 +429,9 @@ class Renderer(renderer.Renderer): iface['mode'] = 'auto' # Use stateless DHCPv6 (0=off, 1=on) iface['dhcp'] = '0' - elif subnet_is_ipv6(subnet) and subnet['type'] == 'static': + elif subnet_is_ipv6(subnet): + # mode might be static6, eni uses 'static' + iface['mode'] = 'static' if accept_ra is not None: # Accept router advertisements (0=off, 1=on) iface['accept_ra'] = '1' if accept_ra else '0' |