17dafa
From 1da1ea11647a60339d063e2d613e692d4bfd79bd Mon Sep 17 00:00:00 2001
a5a74b
From: Vitaly Kuznetsov <vkuznets@redhat.com>
a5a74b
Date: Thu, 26 Apr 2018 09:27:49 +0200
c60dcd
Subject: sysconfig: Don't disable IPV6_AUTOCONF
a5a74b
a5a74b
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
a5a74b
Message-id: <20180426092749.7251-2-vkuznets@redhat.com>
a5a74b
Patchwork-id: 79904
a5a74b
O-Subject: [RHEL7.6/7.5.z cloud-init PATCH 1/1] sysconfig: Don't disable IPV6_AUTOCONF
a5a74b
Bugzilla: 1578702
a5a74b
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
a5a74b
RH-Acked-by: Cathy Avery <cavery@redhat.com>
a5a74b
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
a5a74b
a5a74b
Downstream-only commit 118458a3fb ("sysconfig: Don't write BOOTPROTO=dhcp
a5a74b
for ipv6 dhcp") did two things:
a5a74b
1) Disabled BOOTPROTO='dhcp' for dhcp6 setups. This change seems to be
a5a74b
   correct as BOOTPROTO is unrelated to IPv6. The change was since merged
a5a74b
   upstream (commit a57928d3c314d9568712cd190cb1e721e14c108b).
a5a74b
2) Explicitly disabled AUTOCONF and this broke many valid configurations
a5a74b
   using it instead of DHCPV6C. Revert this part of the change. In case
a5a74b
   DHCPV6C-only support is needed something like a new 'dhcpv6c_only'
a5a74b
   network type needs to be suggested upstream.
a5a74b
a5a74b
X-downstream-only: yes
a5a74b
a5a74b
Resolves: rhbz#1558854
a5a74b
a5a74b
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
a5a74b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
a5a74b
---
a5a74b
 cloudinit/net/sysconfig.py | 1 -
a5a74b
 1 file changed, 1 deletion(-)
a5a74b
a5a74b
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
17dafa
index ec166cf..ae0554e 100644
a5a74b
--- a/cloudinit/net/sysconfig.py
a5a74b
+++ b/cloudinit/net/sysconfig.py
17dafa
@@ -310,7 +310,6 @@ class Renderer(renderer.Renderer):
a5a74b
             if subnet_type == 'dhcp6':
a5a74b
                 iface_cfg['IPV6INIT'] = True
a5a74b
                 iface_cfg['DHCPV6C'] = True
a5a74b
-                iface_cfg['IPV6_AUTOCONF'] = False
a5a74b
             elif subnet_type in ['dhcp4', 'dhcp']:
a5a74b
                 iface_cfg['BOOTPROTO'] = 'dhcp'
a5a74b
             elif subnet_type == 'static':
a5a74b
-- 
a5a74b
1.8.3.1
a5a74b