59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
|
From 2e5e0383567191808e2054cb236bdbd785540b26 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ani Sinha <anisinha@redhat.com>
|
||
|
|
Date: Mon, 22 May 2023 21:30:01 +0530
|
||
|
|
Subject: [PATCH 3/7] nm: generate ipv6 stateful dhcp config at par with
|
||
|
|
sysconfig (#4115)
|
||
|
|
|
||
|
|
RH-Author: Ani Sinha <None>
|
||
|
|
RH-MergeRequest: 103: [RHEL8] Support configuring network by NM keyfiles
|
||
|
|
RH-Bugzilla: 2219528
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [3/7] cf60e9477ac047f9e7e58c2fc528745fc2ae4248
|
||
|
|
|
||
|
|
The sysconfig renderer sets the following in the ifcfg file for IPV6 stateful
|
||
|
|
DHCP configuration:
|
||
|
|
|
||
|
|
BOOTPROTO = "dhcp"
|
||
|
|
DHCPV6C = True
|
||
|
|
IPV6INIT = True
|
||
|
|
IPV6_AUTOCONF = False
|
||
|
|
|
||
|
|
This should result in
|
||
|
|
[ipv6]
|
||
|
|
method=dhcp
|
||
|
|
|
||
|
|
in the network manager generated keyfile as DHCPV6C is set and
|
||
|
|
IPV6_AUTOCONF is not set. Unfortunately the network manager renderer
|
||
|
|
deviates from this and generates:
|
||
|
|
[ipv6]
|
||
|
|
method=auto
|
||
|
|
|
||
|
|
in it's rendered keyfile. This change fixes this deviation and sets the
|
||
|
|
IPV6 dhcp stateful configuration in alignment with what is generated by the
|
||
|
|
sysconfig renderer.
|
||
|
|
|
||
|
|
RHBZ: 2207716
|
||
|
|
|
||
|
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||
|
|
(cherry picked from commit ea573ba6fc25fe49a6a1a322eeb5259b6238d78b)
|
||
|
|
---
|
||
|
|
cloudinit/net/network_manager.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
||
|
|
index 53763d15..744c0cbb 100644
|
||
|
|
--- a/cloudinit/net/network_manager.py
|
||
|
|
+++ b/cloudinit/net/network_manager.py
|
||
|
|
@@ -72,7 +72,7 @@ class NMConnection:
|
||
|
|
"dhcp6": "auto",
|
||
|
|
"ipv6_slaac": "auto",
|
||
|
|
"ipv6_dhcpv6-stateless": "auto",
|
||
|
|
- "ipv6_dhcpv6-stateful": "auto",
|
||
|
|
+ "ipv6_dhcpv6-stateful": "dhcp",
|
||
|
|
"dhcp4": "auto",
|
||
|
|
"dhcp": "auto",
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|