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