forked from rpms/cloud-init
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
|
From 15852ea6958c18e3830aa9244b36cd0decc93b95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Thu, 7 Jan 2021 16:51:30 +0100
|
||
|
|
Subject: [PATCH] Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful
|
||
|
|
on RHEL (#753)
|
||
|
|
|
||
|
|
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||
|
|
RH-MergeRequest: 29: Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful on RHEL (#753)
|
||
|
|
RH-Commit: [1/1] 46943f83071d243bcc61f9d987b4fe7d9cf98596 (eterrell/cloud-init)
|
||
|
|
RH-Bugzilla: 1859695
|
||
|
|
|
||
|
|
IPV6_AUTOCONF needs to be set to 'no' on RHEL so NetworkManager can
|
||
|
|
properly acquire ipv6 address.
|
||
|
|
|
||
|
|
rhbz: #1859695
|
||
|
|
|
||
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
---
|
||
|
|
cloudinit/net/sysconfig.py | 1 +
|
||
|
|
tests/unittests/test_net.py | 1 +
|
||
|
|
2 files changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||
|
|
index 94801a93..1793977d 100644
|
||
|
|
--- a/cloudinit/net/sysconfig.py
|
||
|
|
+++ b/cloudinit/net/sysconfig.py
|
||
|
|
@@ -397,6 +397,7 @@ class Renderer(renderer.Renderer):
|
||
|
|
iface_cfg['BOOTPROTO'] = 'dhcp'
|
||
|
|
iface_cfg['DHCPV6C'] = True
|
||
|
|
iface_cfg['IPV6INIT'] = True
|
||
|
|
+ iface_cfg['IPV6_AUTOCONF'] = False
|
||
|
|
else:
|
||
|
|
iface_cfg['IPV6INIT'] = True
|
||
|
|
# Configure network settings using DHCPv6
|
||
|
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||
|
|
index bcd261db..844d5ba8 100644
|
||
|
|
--- a/tests/unittests/test_net.py
|
||
|
|
+++ b/tests/unittests/test_net.py
|
||
|
|
@@ -1363,6 +1363,7 @@ NETWORK_CONFIGS = {
|
||
|
|
DEVICE=iface0
|
||
|
|
DHCPV6C=yes
|
||
|
|
IPV6INIT=yes
|
||
|
|
+ IPV6_AUTOCONF=no
|
||
|
|
IPV6_FORCE_ACCEPT_RA=yes
|
||
|
|
DEVICE=iface0
|
||
|
|
NM_CONTROLLED=no
|
||
|
|
--
|
||
|
|
2.18.4
|
||
|
|
|