forked from rpms/cloud-init
66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
From bdcad981ac530277529d1c77fb5e9e6f89409bd8 Mon Sep 17 00:00:00 2001
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
|
Date: Mon, 5 Oct 2020 13:51:44 +0200
|
|
Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
|
|
|
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
Message-id: <20190320114559.23708-1-otubo@redhat.com>
|
|
Patchwork-id: 84937
|
|
O-Subject: [RHEL-7.7 cloud-init PATCH] include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
|
Bugzilla: 1653131
|
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
|
The option NOZEROCONF=yes is not included by default in
|
|
/etc/sysconfig/network, which is required by Overcloud instances. The
|
|
patch also includes tests for the modifications.
|
|
|
|
X-downstream-only: yes
|
|
Resolves: rhbz#1653131
|
|
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
cloudinit/net/sysconfig.py | 11 ++++++++++-
|
|
tests/unittests/test_net.py | 1 -
|
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
index 23e467d..af093dd 100644
|
|
--- a/cloudinit/net/sysconfig.py
|
|
+++ b/cloudinit/net/sysconfig.py
|
|
@@ -888,7 +888,16 @@ class Renderer(renderer.Renderer):
|
|
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
|
|
if sysconfig_path.endswith('network'):
|
|
util.ensure_dir(os.path.dirname(sysconfig_path))
|
|
- netcfg = [_make_header(), 'NETWORKING=yes']
|
|
+ netcfg = []
|
|
+ for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
|
|
+ if 'cloud-init' in line:
|
|
+ break
|
|
+ if not line.startswith(('NETWORKING=',
|
|
+ 'IPV6_AUTOCONF=',
|
|
+ 'NETWORKING_IPV6=')):
|
|
+ netcfg.append(line)
|
|
+ # Now generate the cloud-init portion of sysconfig/network
|
|
+ netcfg.extend([_make_header(), 'NETWORKING=yes'])
|
|
if network_state.use_ipv6:
|
|
netcfg.append('NETWORKING_IPV6=yes')
|
|
netcfg.append('IPV6_AUTOCONF=no')
|
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
index 2cc57fe..9985a97 100644
|
|
--- a/tests/unittests/test_net.py
|
|
+++ b/tests/unittests/test_net.py
|
|
@@ -1614,7 +1614,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
BOOTPROTO=none
|
|
DEVICE=bond0
|
|
DHCPV6C=yes
|
|
- IPV6_AUTOCONF=no
|
|
IPV6INIT=yes
|
|
MACADDR=aa:bb:cc:dd:ee:ff
|
|
ONBOOT=yes
|
|
--
|
|
1.8.3.1
|
|
|