|
 |
c60dcd |
From 97b615b4d31efc7964ff99906c0c66f066de3f18 Mon Sep 17 00:00:00 2001
|
|
|
c60dcd |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
c60dcd |
Date: Thu, 31 May 2018 20:00:32 +0200
|
|
|
c60dcd |
Subject: sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
|
|
|
5a2e6e |
|
|
|
5a2e6e |
Don't write BOOTPROTO=dhcp for ipv6 dhcp, as BOOTPROTO applies
|
|
|
5a2e6e |
only to ipv4. Explicitly write IPV6_AUTOCONF=no for dhcp on ipv6.
|
|
|
5a2e6e |
|
|
|
5a2e6e |
X-downstream-only: yes
|
|
|
5a2e6e |
|
|
|
1064ba |
Resolves: rhbz#1519271
|
|
|
5a2e6e |
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
|
5a2e6e |
---
|
|
|
c60dcd |
cloudinit/net/sysconfig.py | 2 +-
|
|
|
c60dcd |
tests/unittests/test_net.py | 3 ++-
|
|
|
c60dcd |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
5a2e6e |
|
|
|
5a2e6e |
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
|
c60dcd |
index cefb5c5..f870b0f 100644
|
|
|
5a2e6e |
--- a/cloudinit/net/sysconfig.py
|
|
|
5a2e6e |
+++ b/cloudinit/net/sysconfig.py
|
|
|
c60dcd |
@@ -286,7 +286,7 @@ class Renderer(renderer.Renderer):
|
|
|
5a2e6e |
if subnet_type == 'dhcp6':
|
|
|
5a2e6e |
iface_cfg['IPV6INIT'] = True
|
|
|
5a2e6e |
iface_cfg['DHCPV6C'] = True
|
|
|
5a2e6e |
- iface_cfg['BOOTPROTO'] = 'dhcp'
|
|
|
5a2e6e |
+ iface_cfg['IPV6_AUTOCONF'] = False
|
|
|
5a2e6e |
elif subnet_type in ['dhcp4', 'dhcp']:
|
|
|
5a2e6e |
iface_cfg['BOOTPROTO'] = 'dhcp'
|
|
|
5a2e6e |
elif subnet_type == 'static':
|
|
|
c60dcd |
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
|
c60dcd |
index 95318ed..9cf41bc 100644
|
|
|
c60dcd |
--- a/tests/unittests/test_net.py
|
|
|
c60dcd |
+++ b/tests/unittests/test_net.py
|
|
|
c60dcd |
@@ -734,9 +734,10 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
|
|
|
c60dcd |
"""miimon=100"
|
|
|
c60dcd |
BONDING_SLAVE0=eth1
|
|
|
c60dcd |
BONDING_SLAVE1=eth2
|
|
|
c60dcd |
- BOOTPROTO=dhcp
|
|
|
c60dcd |
+ BOOTPROTO=none
|
|
|
c60dcd |
DEVICE=bond0
|
|
|
c60dcd |
DHCPV6C=yes
|
|
|
c60dcd |
+ IPV6_AUTOCONF=no
|
|
|
c60dcd |
IPV6INIT=yes
|
|
|
c60dcd |
MACADDR=aa:bb:cc:dd:ee:ff
|
|
|
c60dcd |
ONBOOT=yes
|
|
|
5a2e6e |
--
|
|
|
c60dcd |
1.8.3.1
|
|
|
5a2e6e |
|