Skip to content

Network config V2 -> V1 conversion: handle accept-ra #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ajmyyra wants to merge 3 commits into from
Closed

Network config V2 -> V1 conversion: handle accept-ra #786

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dce595c
Network config V2 -> V1 conversion: handle accept_ra
Jan 23, 2021
5f7e877
Correct format for accept-ra
Jan 27, 2021
428a557
Net conversion: just add accept-ra without specific stateless setting
Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cloudinit/net/network_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ def _add_dhcp_overrides(overrides, subnet):
subnets.append(subnet)
if cfg.get('dhcp6'):
subnet = {'type': 'dhcp6'}
if 'accept-ra' in cfg:
subnet.update({'accept-ra': cfg.get('accept-ra')})
self.use_ipv6 = True
_add_dhcp_overrides(cfg.get('dhcp6-overrides', {}), subnet)
subnets.append(subnet)
Expand All @@ -788,11 +790,12 @@ def _add_dhcp_overrides(overrides, subnet):
if 'gateway6' in cfg and gateway6 is None:
gateway6 = cfg.get('gateway6')
subnet.update({'gateway': gateway6})
if cfg.get('accept-ra'):
subnet.update({'accept-ra': True})
else:
if 'gateway4' in cfg and gateway4 is None:
gateway4 = cfg.get('gateway4')
subnet.update({'gateway': gateway4})

if 'nameservers' in cfg and not nameservers:
addresses = cfg.get('nameservers').get('addresses')
if addresses:
Expand Down