diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2018-04-25 16:18:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2018-04-25 16:18:27 -0400 |
| commit | a57928d3c314d9568712cd190cb1e721e14c108b (patch) | |
| tree | ebf9a356d671e4365f566631b3afcdaf03e025f3 /cloudinit/net | |
| parent | 00d7b9c5f5380d01c76b648877943c4c0cfbcfff (diff) | |
| download | vyos-cloud-init-a57928d3c314d9568712cd190cb1e721e14c108b.tar.gz vyos-cloud-init-a57928d3c314d9568712cd190cb1e721e14c108b.zip | |
sysconfig: dhcp6 subnet type should not imply dhcpv4
BOOTPROTO=dhcp in sysconfig enables DHCPv4 and we should not do this
implicitly when 'dhcp6' subnet is specified. In case both dhcpv4 and
dhcpv6 are needed users should specify both:
subnets:
- type: dhcp6
- type: dhcp
Fix the current code and add a dhcpv6 only test.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Diffstat (limited to 'cloudinit/net')
| -rw-r--r-- | cloudinit/net/sysconfig.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py index 7a7f5093..e53b9f1b 100644 --- a/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py @@ -287,7 +287,6 @@ class Renderer(renderer.Renderer): if subnet_type == 'dhcp6': iface_cfg['IPV6INIT'] = True iface_cfg['DHCPV6C'] = True - iface_cfg['BOOTPROTO'] = 'dhcp' elif subnet_type in ['dhcp4', 'dhcp']: iface_cfg['BOOTPROTO'] = 'dhcp' elif subnet_type == 'static': |