cloud-init/SOURCES/0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch

54 lines
2.3 KiB
Diff
Raw Normal View History

2024-05-22 10:41:25 +00:00
From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
2021-04-06 13:33:04 +00:00
From: Eduardo Otubo <otubo@redhat.com>
2021-11-09 09:52:07 +00:00
Date: Fri, 7 May 2021 13:36:13 +0200
2021-04-06 13:33:04 +00:00
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>
2024-01-15 09:07:25 +00:00
(cherry picked from commit ffa647e83efd4293bd027e9e390274aad8a12d94)
Signed-off-by: Ani Sinha <anisinha@redhat.com>
2024-05-22 10:41:25 +00:00
Signed-off-by: Cathy Avery <cavery@redhat.com>
2021-04-06 13:33:04 +00:00
---
2022-11-08 06:38:55 +00:00
cloudinit/net/sysconfig.py | 11 ++++++++++-
2024-05-22 10:41:25 +00:00
redhat/scripts/frh.py | 10 +++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
2021-04-06 13:33:04 +00:00
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
2024-05-22 10:41:25 +00:00
index 3b7a1f93..f01c4236 100644
2021-04-06 13:33:04 +00:00
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
2024-05-22 10:41:25 +00:00
@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
2021-04-06 13:33:04 +00:00
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
2022-11-08 06:38:55 +00:00
if sysconfig_path.endswith("network"):
2021-04-06 13:33:04 +00:00
util.ensure_dir(os.path.dirname(sysconfig_path))
2022-11-08 06:38:55 +00:00
- netcfg = [_make_header(), "NETWORKING=yes"]
2021-04-06 13:33:04 +00:00
+ netcfg = []
2022-11-08 06:38:55 +00:00
+ for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
+ if "cloud-init" in line:
2021-04-06 13:33:04 +00:00
+ break
2024-05-22 10:41:25 +00:00
+ if not line.startswith(
+ ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
+ ):
2021-04-06 13:33:04 +00:00
+ netcfg.append(line)
+ # Now generate the cloud-init portion of sysconfig/network
2022-11-08 06:38:55 +00:00
+ netcfg.extend([_make_header(), "NETWORKING=yes"])
2021-04-06 13:33:04 +00:00
if network_state.use_ipv6:
2022-11-08 06:38:55 +00:00
netcfg.append("NETWORKING_IPV6=yes")
netcfg.append("IPV6_AUTOCONF=no")