Skip to content

Adding BOOTPROTO = dhcp to render sysconfig dhcp6 stateful on RHEL #685

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

Merged
smoser merged 3 commits into from
Dec 1, 2020
Merged

Adding BOOTPROTO = dhcp to render sysconfig dhcp6 stateful on RHEL #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
176ee27
Adding BOOTPROTO = dhcp to render sysconfig dhcp6 stateful on RHEL
otubo Nov 24, 2020
f69a19b
Merge branch 'master' into 1859695
OddBloke Nov 27, 2020
f61879a
Merge branch 'master' into 1859695
smoser Dec 1, 2020
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
6 changes: 6 additions & 0 deletions cloudinit/net/sysconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@ def _render_subnets(cls, iface_cfg, subnets, has_default_route, flavor):
# Only IPv6 is DHCP, IPv4 may be static
iface_cfg['BOOTPROTO'] = 'dhcp6'
iface_cfg['DHCLIENT6_MODE'] = 'managed'
# only if rhel AND dhcpv6 stateful
elif (flavor == 'rhel' and
subnet_type == 'ipv6_dhcpv6-stateful'):
iface_cfg['BOOTPROTO'] = 'dhcp'
iface_cfg['DHCPV6C'] = True
iface_cfg['IPV6INIT'] = True
else:
iface_cfg['IPV6INIT'] = True
# Configure network settings using DHCPv6
Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/test_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@
},
'expected_sysconfig_rhel': {
'ifcfg-iface0': textwrap.dedent("""\
BOOTPROTO=none
BOOTPROTO=dhcp
DEVICE=iface0
DHCPV6C=yes
IPV6INIT=yes
Expand Down