Compare commits
No commits in common. "a9" and "c8" have entirely different histories.
|
@ -1,99 +0,0 @@
|
||||||
From 03345a88b8b0008a4a81e010d46290f5ba643ebc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
|
||||||
Date: Wed, 13 Dec 2023 11:54:55 +0530
|
|
||||||
Subject: [PATCH] Add initial redhat changes
|
|
||||||
|
|
||||||
Adding minimal set of changes necessary for successful build of the package
|
|
||||||
on RHEL/CentOS 9 Stream koji.
|
|
||||||
|
|
||||||
Additional changes on top of the changes in 23.1.1 rebase:
|
|
||||||
- Updated VERSION, TARSHA512, MARKER and BUILD_TARGET_RHEL parameters in
|
|
||||||
Makefile.common in .dist/
|
|
||||||
- Squashed unit test fixes for the downstream changes in cloudinit/settings.py.
|
|
||||||
|
|
||||||
Changes from 23.1.1 rebase follows:
|
|
||||||
|
|
||||||
Merged patches (23.1.1):
|
|
||||||
724a80ac Add TargetRelease
|
|
||||||
967a4405b rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
|
||||||
^ Merged since it removes hunks added in this commit itself
|
|
||||||
|
|
||||||
Discarded because not needed anymore (packit):
|
|
||||||
e3fd7ce12 Configure Packit to ignore the .gitignore file
|
|
||||||
e18654e9 Fixes for packit support
|
|
||||||
|
|
||||||
Discarded because file does not exist anymore and templates are aligned with upstream:
|
|
||||||
3576b12460bf18557857ee25df6bf530dab66612 Adding _netdev to the default mount configuration
|
|
||||||
8092b57ab245856ff1fdde1469960608a489c95e Remove rhel specific files
|
|
||||||
|
|
||||||
Added the following entry to %files to keep track of the new README file in config/clean.d/README
|
|
||||||
%doc %{_sysconfdir}/cloud/clean.d/README
|
|
||||||
|
|
||||||
ignored
|
|
||||||
c75e509b0 Revert "Revert "Setting highest autoconnect priority for network-scripts""
|
|
||||||
0eba5c619 Revert "Setting highest autoconnect priority for network-scripts"
|
|
||||||
|
|
||||||
ignored
|
|
||||||
ba19343c0d9807d0c68a2d8e4ab274f3ca884247 Add Gitlab CI
|
|
||||||
fe09305a5479a4814d6c46df07a906bafa29d637 Delete .gitlab-ci.yml
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
missing rhel/ static files and "" instead of '' in setup.py
|
|
||||||
|
|
||||||
X-downstram-only: true
|
|
||||||
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/settings.py | 5 +++--
|
|
||||||
tests/unittests/cmd/test_main.py | 15 +++++++++------
|
|
||||||
2 files changed, 12 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
||||||
index 592e144d..5ced21bd 100644
|
|
||||||
--- a/cloudinit/settings.py
|
|
||||||
+++ b/cloudinit/settings.py
|
|
||||||
@@ -54,13 +54,14 @@ CFG_BUILTIN = {
|
|
||||||
],
|
|
||||||
"def_log_file": "/var/log/cloud-init.log",
|
|
||||||
"log_cfgs": [],
|
|
||||||
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
|
||||||
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
|
||||||
+ "syslog_fix_perms": [],
|
|
||||||
"system_info": {
|
|
||||||
"paths": {
|
|
||||||
"cloud_dir": "/var/lib/cloud",
|
|
||||||
"templates_dir": "/etc/cloud/templates/",
|
|
||||||
},
|
|
||||||
- "distro": "ubuntu",
|
|
||||||
+ "distro": "rhel",
|
|
||||||
"network": {"renderers": None},
|
|
||||||
},
|
|
||||||
"vendor_data": {"enabled": True, "prefix": []},
|
|
||||||
diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
|
|
||||||
index ab427115..19d26ebe 100644
|
|
||||||
--- a/tests/unittests/cmd/test_main.py
|
|
||||||
+++ b/tests/unittests/cmd/test_main.py
|
|
||||||
@@ -119,14 +119,17 @@ class TestMain(FilesystemMockingTestCase):
|
|
||||||
{
|
|
||||||
"def_log_file": "/var/log/cloud-init.log",
|
|
||||||
"log_cfgs": [],
|
|
||||||
- "syslog_fix_perms": [
|
|
||||||
- "syslog:adm",
|
|
||||||
- "root:adm",
|
|
||||||
- "root:wheel",
|
|
||||||
- "root:root",
|
|
||||||
- ],
|
|
||||||
"vendor_data": {"enabled": True, "prefix": []},
|
|
||||||
"vendor_data2": {"enabled": True, "prefix": []},
|
|
||||||
+ "syslog_fix_perms": [],
|
|
||||||
+ "mount_default_fields": [
|
|
||||||
+ None,
|
|
||||||
+ None,
|
|
||||||
+ "auto",
|
|
||||||
+ "defaults,nofail",
|
|
||||||
+ "0",
|
|
||||||
+ "2",
|
|
||||||
+ ],
|
|
||||||
}
|
|
||||||
)
|
|
||||||
updated_cfg.pop("system_info")
|
|
|
@ -1,31 +1,32 @@
|
||||||
From 5129908caa1867c7f584ec8d38607cf56b20521a Mon Sep 17 00:00:00 2001
|
From 2d3a22bd5b36c20b53f1604e9ff6ce05c98753ec Mon Sep 17 00:00:00 2001
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
From: Cathy Avery <cavery@redhat.com>
|
||||||
Date: Fri, 7 May 2021 13:36:06 +0200
|
Date: Mon, 18 Dec 2023 12:54:16 -0500
|
||||||
Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
|
Subject: Do not write NM_CONTROLLED=no in generated interface config files
|
||||||
files
|
|
||||||
|
|
||||||
Conflicts 20.3:
|
Squashed from:
|
||||||
- Not appplying patch on cloudinit/net/sysconfig.py since it now has a
|
From 3ee57b044d2b85d8172961258d2edeab82a43772 Mon Sep 17 00:00:00 2001
|
||||||
mechanism to identify if cloud-init is running on RHEL, having the
|
From: Eduardo Otubo <otubo@redhat.com>
|
||||||
correct settings for NM_CONTROLLED.
|
Date: Fri, 7 May 2021 13:36:06 +0200
|
||||||
|
Subject: [PATCH 02/12] Do not write NM_CONTROLLED=no in generated interface config files
|
||||||
|
|
||||||
|
From 3a070f23440c9eb6e0e5fb3605e36285e8a5b727 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Fri, 23 Jun 2023 16:54:24 +0530
|
||||||
|
Subject: [PATCH 27/51] test fixes: remove NM_CONTROLLED=no from tests
|
||||||
|
fixes: b3b96bff187e9 ("Do not write NM_CONTROLLED=no in generated interface config files")
|
||||||
|
|
||||||
Merged patches (21.1):
|
|
||||||
- ecbace48 sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
|
|
||||||
- a1a00383 include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
|
||||||
X-downstream-only: true
|
X-downstream-only: true
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
||||||
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
---
|
---
|
||||||
cloudinit/net/sysconfig.py | 12 ++++-
|
cloudinit/net/sysconfig.py | 1 -
|
||||||
tests/unittests/cmd/devel/test_net_convert.py | 1 -
|
tests/unittests/cmd/devel/test_net_convert.py | 1 -
|
||||||
tests/unittests/distros/test_netconfig.py | 8 ---
|
tests/unittests/distros/test_netconfig.py | 8 ---
|
||||||
tests/unittests/test_net.py | 53 -------------------
|
tests/unittests/test_net.py | 53 -------------------
|
||||||
4 files changed, 10 insertions(+), 64 deletions(-)
|
4 files changed, 63 deletions(-)
|
||||||
|
|
||||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
index 7570a5e3..f01c4236 100644
|
index 7570a5e3..3b7a1f93 100644
|
||||||
--- a/cloudinit/net/sysconfig.py
|
--- a/cloudinit/net/sysconfig.py
|
||||||
+++ b/cloudinit/net/sysconfig.py
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
|
@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
|
||||||
|
@ -36,24 +37,6 @@ index 7570a5e3..f01c4236 100644
|
||||||
"BOOTPROTO": "none",
|
"BOOTPROTO": "none",
|
||||||
},
|
},
|
||||||
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
||||||
@@ -1030,7 +1029,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/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
|
diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
|
||||||
index fb72963f..7b9121b2 100644
|
index fb72963f..7b9121b2 100644
|
||||||
--- a/tests/unittests/cmd/devel/test_net_convert.py
|
--- a/tests/unittests/cmd/devel/test_net_convert.py
|
||||||
|
@ -562,3 +545,6 @@ index c5509536..052b0674 100644
|
||||||
ONBOOT=yes
|
ONBOOT=yes
|
||||||
TYPE=Ethernet
|
TYPE=Ethernet
|
||||||
USERCTL=no
|
USERCTL=no
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,582 +0,0 @@
|
||||||
From 8a2fcbbcfdfc1df6f6c18f96588154f40083a239 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
|
||||||
Date: Wed, 13 Dec 2023 11:55:16 +0530
|
|
||||||
Subject: [PATCH] Setting autoconnect priority setting for network-scripts
|
|
||||||
|
|
||||||
Squashed the following three downstream only commits from RHEL 9.3:
|
|
||||||
|
|
||||||
Commit 1:
|
|
||||||
|
|
||||||
Setting highest autoconnect priority for network-scripts
|
|
||||||
|
|
||||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
RH-MergeRequest: 22: Setting highest autoconnect priority for network-scripts
|
|
||||||
RH-Commit: [1/1] 34f1d62f8934a983a124df95b861a1e448681d3b (otubo/cloud-init-src)
|
|
||||||
RH-Bugzilla: 2036060
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
|
|
||||||
Set the highest autoconnect priority for network-scripts which is
|
|
||||||
loaded by NetworkManager ifcfg-rh plugin. Note that keyfile is the only
|
|
||||||
and default existing plugin on RHEL9, by setting the highest autoconnect
|
|
||||||
priority for network-scripts, NetworkManager will activate
|
|
||||||
network-scripts but keyfile. Network-scripts path:
|
|
||||||
|
|
||||||
Since this is a blocking issue, we decided to have this one-liner
|
|
||||||
downstream-only patch so we can move forward and have a better
|
|
||||||
NetworkManager support later on the release.
|
|
||||||
|
|
||||||
rhbz: 2036060
|
|
||||||
x-downstream-only: yes
|
|
||||||
|
|
||||||
Commit 2:
|
|
||||||
|
|
||||||
net/sysconfig: do not use the highest autoconnect priority
|
|
||||||
|
|
||||||
Using the highest priority is a very big hammer that we may not want to use. We
|
|
||||||
may want users to override the cloud init generated ifcfg files for custom
|
|
||||||
configuration of interfaces. If cloud init uses the highest priority, nothing
|
|
||||||
can beat it. Hence lower the priority to 120 allowing values from 121 to 999
|
|
||||||
to be used by users if they want to use a custom interface nm keyfile.
|
|
||||||
|
|
||||||
X-downstream-only: true
|
|
||||||
|
|
||||||
Suggested-by: thaller@redhat.com
|
|
||||||
fixes: c589da20eb92231 ("Setting highest autoconnect priority for network-scripts")
|
|
||||||
|
|
||||||
Commit 3:
|
|
||||||
|
|
||||||
test fixes: update tests to reflect AUTOCONNECT_PRIORITY setting
|
|
||||||
|
|
||||||
X-downstream-only: true
|
|
||||||
fixes: 0a2c6b6118ff ("net/sysconfig: do not use the highest autoconnect priority")
|
|
||||||
fixes: c589da20eb92 ("Setting highest autoconnect priority for network-scripts")
|
|
||||||
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/net/sysconfig.py | 1 +
|
|
||||||
tests/unittests/cmd/devel/test_net_convert.py | 1 +
|
|
||||||
tests/unittests/distros/test_netconfig.py | 8 +++
|
|
||||||
tests/unittests/test_net.py | 53 +++++++++++++++++++
|
|
||||||
4 files changed, 63 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
||||||
index f01c4236..d39f4fe3 100644
|
|
||||||
--- a/cloudinit/net/sysconfig.py
|
|
||||||
+++ b/cloudinit/net/sysconfig.py
|
|
||||||
@@ -318,6 +318,7 @@ class Renderer(renderer.Renderer):
|
|
||||||
"ONBOOT": True,
|
|
||||||
"USERCTL": False,
|
|
||||||
"BOOTPROTO": "none",
|
|
||||||
+ "AUTOCONNECT_PRIORITY": 120,
|
|
||||||
},
|
|
||||||
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
|
||||||
}
|
|
||||||
diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
|
|
||||||
index 7b9121b2..288e3e37 100644
|
|
||||||
--- a/tests/unittests/cmd/devel/test_net_convert.py
|
|
||||||
+++ b/tests/unittests/cmd/devel/test_net_convert.py
|
|
||||||
@@ -60,6 +60,7 @@ DHCP=ipv4
|
|
||||||
SAMPLE_SYSCONFIG_CONTENT = """\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth0
|
|
||||||
ONBOOT=yes
|
|
||||||
diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
|
|
||||||
index 962ff7fb..4c624079 100644
|
|
||||||
--- a/tests/unittests/distros/test_netconfig.py
|
|
||||||
+++ b/tests/unittests/distros/test_netconfig.py
|
|
||||||
@@ -717,6 +717,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
expected_cfgs = {
|
|
||||||
self.ifcfg_path("eth0"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -730,6 +731,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
),
|
|
||||||
self.ifcfg_path("eth1"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth1
|
|
||||||
ONBOOT=yes
|
|
||||||
@@ -754,6 +756,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
expected_cfgs = {
|
|
||||||
self.ifcfg_path("eth0"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -769,6 +772,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
),
|
|
||||||
self.ifcfg_path("eth1"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth1
|
|
||||||
ONBOOT=yes
|
|
||||||
@@ -812,6 +816,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
expected_cfgs = {
|
|
||||||
self.ifcfg_path("eth0"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
HWADDR=00:16:3e:60:7c:df
|
|
||||||
@@ -824,6 +829,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
),
|
|
||||||
self.ifcfg_path("infra0"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=infra0
|
|
||||||
IPADDR=10.0.1.2
|
|
||||||
@@ -859,6 +865,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
expected_cfgs = {
|
|
||||||
self.ifcfg_path("eth0"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
IPADDR=192.10.1.2
|
|
||||||
@@ -870,6 +877,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
|
||||||
),
|
|
||||||
self.ifcfg_path("eth0.1001"): dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0.1001
|
|
||||||
IPADDR=10.0.1.2
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index 052b0674..cef4fa2d 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -578,6 +578,7 @@ dns = none
|
|
||||||
"""
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -740,6 +741,7 @@ dns = none
|
|
||||||
"""
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -897,6 +899,7 @@ dns = none
|
|
||||||
"""
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -1137,6 +1140,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-eth1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=cf:d6:af:48:e8:80
|
|
||||||
@@ -1146,6 +1150,7 @@ NETWORK_CONFIGS = {
|
|
||||||
),
|
|
||||||
"ifcfg-eth99": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth99
|
|
||||||
@@ -1311,6 +1316,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-eth1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=cf:d6:af:48:e8:80
|
|
||||||
@@ -1320,6 +1326,7 @@ NETWORK_CONFIGS = {
|
|
||||||
),
|
|
||||||
"ifcfg-eth99": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth99
|
|
||||||
@@ -1566,6 +1573,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
IPADDR=192.168.14.2
|
|
||||||
@@ -1712,6 +1720,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
DHCPV6C=yes
|
|
||||||
@@ -1801,6 +1810,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
DHCPV6C=yes
|
|
||||||
@@ -1876,6 +1886,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
DHCPV6C=yes
|
|
||||||
@@ -1940,6 +1951,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
IPV6_AUTOCONF=yes
|
|
||||||
@@ -1995,6 +2007,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
IPV6ADDR=2001:1::1/64
|
|
||||||
@@ -2051,6 +2064,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
DHCPV6C=yes
|
|
||||||
@@ -2135,6 +2149,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=iface0
|
|
||||||
DHCPV6C=yes
|
|
||||||
@@ -2181,6 +2196,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=iface0
|
|
||||||
ONBOOT=yes
|
|
||||||
@@ -2256,6 +2272,7 @@ NETWORK_CONFIGS = {
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-iface0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=iface0
|
|
||||||
ETHTOOL_OPTS="wol g"
|
|
||||||
@@ -2591,6 +2608,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-bond0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BONDING_MASTER=yes
|
|
||||||
BONDING_OPTS="mode=active-backup """
|
|
||||||
"""xmit_hash_policy=layer3+4 """
|
|
||||||
@@ -2608,6 +2626,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-bond0.200": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=bond0.200
|
|
||||||
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
||||||
@@ -2619,6 +2638,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
"ifcfg-br0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
AGEING=250
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=br0
|
|
||||||
@@ -2638,6 +2658,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
HWADDR=c0:d6:9f:2c:e8:80
|
|
||||||
@@ -2647,6 +2668,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth0.101": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0.101
|
|
||||||
@@ -2666,6 +2688,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=aa:d6:9f:2c:e8:80
|
|
||||||
@@ -2677,6 +2700,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth2": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth2
|
|
||||||
HWADDR=c0:bb:9f:2c:e8:80
|
|
||||||
@@ -2688,6 +2712,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth3": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth3
|
|
||||||
@@ -2698,6 +2723,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth4": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth4
|
|
||||||
@@ -2708,6 +2734,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-eth5": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth5
|
|
||||||
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
||||||
@@ -2718,6 +2745,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
),
|
|
||||||
"ifcfg-ib0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=ib0
|
|
||||||
HWADDR=a0:00:02:20:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:15:e2:c1
|
|
||||||
@@ -3422,6 +3450,7 @@ iface bond0 inet6 static
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-bond0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BONDING_MASTER=yes
|
|
||||||
BONDING_OPTS="mode=active-backup xmit_hash_policy=layer3+4 """
|
|
||||||
"""miimon=100 num_grat_arp=5 """
|
|
||||||
@@ -3452,6 +3481,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-bond0s0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=bond0s0
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:00
|
|
||||||
@@ -3479,6 +3509,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-bond0s1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=bond0s1
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:01
|
|
||||||
@@ -3628,6 +3659,7 @@ iface bond0 inet6 static
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-en0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=en0
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:00
|
|
||||||
@@ -3637,6 +3669,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-en0.99": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=en0.99
|
|
||||||
@@ -3774,6 +3807,7 @@ iface bond0 inet6 static
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-br0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=br0
|
|
||||||
IPADDR=192.168.2.2
|
|
||||||
@@ -3787,6 +3821,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-eth0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -3802,6 +3837,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-eth1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth1
|
|
||||||
@@ -3989,6 +4025,7 @@ iface bond0 inet6 static
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-eth0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
HWADDR=52:54:00:12:34:00
|
|
||||||
@@ -4001,6 +4038,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-eth1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=52:54:00:12:34:aa
|
|
||||||
@@ -4012,6 +4050,7 @@ iface bond0 inet6 static
|
|
||||||
),
|
|
||||||
"ifcfg-eth2": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth2
|
|
||||||
HWADDR=52:54:00:12:34:ff
|
|
||||||
@@ -4096,6 +4135,7 @@ iface bond0 inet6 static
|
|
||||||
"expected_sysconfig_rhel": {
|
|
||||||
"ifcfg-eth0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
HWADDR=cf:d6:af:48:e8:80
|
|
||||||
@@ -4693,6 +4733,7 @@ class TestRhelSysConfigRendering(CiTestCase):
|
|
||||||
expected_content = """
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth1000
|
|
||||||
HWADDR=07-1c-c6-75-a4-be
|
|
||||||
@@ -4900,6 +4941,7 @@ USERCTL=no
|
|
||||||
expected = """\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=interface0
|
|
||||||
@@ -4929,6 +4971,7 @@ USERCTL=no
|
|
||||||
expected_i1 = """\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
||||||
@@ -4945,6 +4988,7 @@ USERCTL=no
|
|
||||||
expected_i2 = """\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth1
|
|
||||||
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
||||||
@@ -4972,6 +5016,7 @@ USERCTL=no
|
|
||||||
expected = """\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth0
|
|
||||||
ONBOOT=yes
|
|
||||||
@@ -5191,6 +5236,7 @@ USERCTL=no
|
|
||||||
"expected_sysconfig": {
|
|
||||||
"ifcfg-ens3": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=ens3
|
|
||||||
@@ -5235,6 +5281,7 @@ USERCTL=no
|
|
||||||
expected = {
|
|
||||||
"ifcfg-eno1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eno1
|
|
||||||
ONBOOT=yes
|
|
||||||
@@ -5244,6 +5291,7 @@ USERCTL=no
|
|
||||||
),
|
|
||||||
"ifcfg-eno1.1000": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eno1.1000
|
|
||||||
IPADDR=192.6.1.9
|
|
||||||
@@ -5276,6 +5324,7 @@ USERCTL=no
|
|
||||||
expected = {
|
|
||||||
"ifcfg-bond0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BONDING_MASTER=yes
|
|
||||||
BONDING_SLAVE0=enp0s0
|
|
||||||
BONDING_SLAVE1=enp0s1
|
|
||||||
@@ -5291,6 +5340,7 @@ USERCTL=no
|
|
||||||
),
|
|
||||||
"ifcfg-enp0s0": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BONDING_MASTER=yes
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=enp0s0
|
|
||||||
@@ -5303,6 +5353,7 @@ USERCTL=no
|
|
||||||
),
|
|
||||||
"ifcfg-enp0s1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BONDING_MASTER=yes
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=enp0s1
|
|
||||||
@@ -5333,6 +5384,7 @@ USERCTL=no
|
|
||||||
expected = {
|
|
||||||
"ifcfg-eno1": textwrap.dedent(
|
|
||||||
"""\
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eno1
|
|
||||||
HWADDR=07-1c-c6-75-a4-be
|
|
||||||
@@ -5411,6 +5463,7 @@ USERCTL=no
|
|
||||||
"""\
|
|
||||||
# Created by cloud-init automatically, do not edit.
|
|
||||||
#
|
|
||||||
+ AUTOCONNECT_PRIORITY=120
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEFROUTE=yes
|
|
||||||
DEVICE=eth0
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eduardo Otubo <otubo@redhat.com>
|
||||||
|
Date: Fri, 7 May 2021 13:36:13 +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>
|
||||||
|
(cherry picked from commit ffa647e83efd4293bd027e9e390274aad8a12d94)
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/net/sysconfig.py | 11 ++++++++++-
|
||||||
|
redhat/scripts/frh.py | 10 +++++++---
|
||||||
|
2 files changed, 17 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
|
index 3b7a1f93..f01c4236 100644
|
||||||
|
--- a/cloudinit/net/sysconfig.py
|
||||||
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
|
@@ -1029,7 +1029,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")
|
|
@ -0,0 +1,83 @@
|
||||||
|
From f7236c817aee8c39223cca88deb8341b4f2b5dfa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Cathy Avery <cavery@redhat.com>
|
||||||
|
Date: Mon, 18 Dec 2023 14:13:19 -0500
|
||||||
|
Subject: settings.py: update settings for rhel
|
||||||
|
|
||||||
|
commit 2bf34313f2e9599e3304b5446411b5ada6ccd7f0
|
||||||
|
Author: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue Apr 11 04:20:00 2023 -0400
|
||||||
|
Please see commit 5e1e568d7085fd4443
|
||||||
|
|
||||||
|
(" Add initial redhat setup")
|
||||||
|
from rhel8.8.0 branch for setings.py. Applying the same for the rebased
|
||||||
|
cloud-init.
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
|
||||||
|
Conflicts: "def_log_file_mode": 0o600 as commit
|
||||||
|
130899115 'limit permissions on def_log_file' was not applied.
|
||||||
|
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/settings.py | 7 +++++--
|
||||||
|
tests/unittests/cmd/test_main.py | 17 +++++++++++------
|
||||||
|
2 files changed, 16 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||||
|
index 592e144d..87829ff0 100644
|
||||||
|
--- a/cloudinit/settings.py
|
||||||
|
+++ b/cloudinit/settings.py
|
||||||
|
@@ -54,13 +54,16 @@ CFG_BUILTIN = {
|
||||||
|
],
|
||||||
|
"def_log_file": "/var/log/cloud-init.log",
|
||||||
|
"log_cfgs": [],
|
||||||
|
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
||||||
|
+ "syslog_fix_perms": [],
|
||||||
|
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
||||||
|
+ "ssh_deletekeys": False,
|
||||||
|
+ "ssh_genkeytypes": [],
|
||||||
|
"system_info": {
|
||||||
|
"paths": {
|
||||||
|
"cloud_dir": "/var/lib/cloud",
|
||||||
|
"templates_dir": "/etc/cloud/templates/",
|
||||||
|
},
|
||||||
|
- "distro": "ubuntu",
|
||||||
|
+ "distro": "rhel",
|
||||||
|
"network": {"renderers": None},
|
||||||
|
},
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
|
||||||
|
index ab427115..c8c2ae81 100644
|
||||||
|
--- a/tests/unittests/cmd/test_main.py
|
||||||
|
+++ b/tests/unittests/cmd/test_main.py
|
||||||
|
@@ -119,14 +119,19 @@ class TestMain(FilesystemMockingTestCase):
|
||||||
|
{
|
||||||
|
"def_log_file": "/var/log/cloud-init.log",
|
||||||
|
"log_cfgs": [],
|
||||||
|
- "syslog_fix_perms": [
|
||||||
|
- "syslog:adm",
|
||||||
|
- "root:adm",
|
||||||
|
- "root:wheel",
|
||||||
|
- "root:root",
|
||||||
|
- ],
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
"vendor_data2": {"enabled": True, "prefix": []},
|
||||||
|
+ "syslog_fix_perms": [],
|
||||||
|
+ "ssh_deletekeys": False,
|
||||||
|
+ "ssh_genkeytypes": [],
|
||||||
|
+ "mount_default_fields": [
|
||||||
|
+ None,
|
||||||
|
+ None,
|
||||||
|
+ "auto",
|
||||||
|
+ "defaults,nofail",
|
||||||
|
+ "0",
|
||||||
|
+ "2",
|
||||||
|
+ ],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
updated_cfg.pop("system_info")
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
From 77585bbc6d01399ff88865b55dfb7a47b8640271 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
Date: Thu, 20 May 2021 08:53:55 +0200
|
||||||
|
Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
|
||||||
|
cloud.cfg
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 113: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
||||||
|
RH-Jira: RHEL-16572
|
||||||
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/1] f506bf58dc5458f50624342ec33bcd390aa0b719 (anisinha/rhel-cloud-init)
|
||||||
|
|
||||||
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
||||||
|
RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
|
||||||
|
RH-Bugzilla: 1957532
|
||||||
|
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||||
|
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
|
||||||
|
Currently genkeytypes in cloud.cfg is set to None, so together with
|
||||||
|
ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
|
||||||
|
keys and not generate new ones.
|
||||||
|
|
||||||
|
Just removing that property in cloud.cfg is not enough, because
|
||||||
|
settings.py provides another empty default value that will be used
|
||||||
|
instead, resulting to no key generated even when the property is not defined.
|
||||||
|
|
||||||
|
Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
|
||||||
|
but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
|
||||||
|
cloud.cfg with the above defaults.
|
||||||
|
|
||||||
|
Also remove ssh_deletekeys in settings.py as we always need
|
||||||
|
to 1 (and it also defaults to 1).
|
||||||
|
|
||||||
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
(cherry picked from commit b545a0cbabe8924d048b7172b30e7aad59ed32d5)
|
||||||
|
(cherry picked from commit 855dec5dcc0892c0f7cedf06b025a794769a2a8d)
|
||||||
|
|
||||||
|
Fix unit test breakage
|
||||||
|
|
||||||
|
Fix unit test breakage due to the downstream change
|
||||||
|
5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
Fixes: 5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
|
||||||
|
Squashed:
|
||||||
|
commit 1afec9e6008db187d1b675e4473d5a2bf0b3c36b
|
||||||
|
Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
Date: Thu May 20 08:53:55 2021 +0200
|
||||||
|
Subject: [PATCH 49/51] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py
|
||||||
|
and set in cloud.cfg
|
||||||
|
|
||||||
|
From fe6fb1843fe8df75899fe189b9e5f8ce3cd75be1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Fri, 8 Dec 2023 12:50:15 +0530
|
||||||
|
Subject: [PATCH 51/51] Fix unit test breakage
|
||||||
|
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/settings.py | 2 --
|
||||||
|
tests/unittests/cmd/test_main.py | 2 --
|
||||||
|
2 files changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||||
|
index 87829ff0..3a581e5b 100644
|
||||||
|
--- a/cloudinit/settings.py
|
||||||
|
+++ b/cloudinit/settings.py
|
||||||
|
@@ -56,8 +56,6 @@ CFG_BUILTIN = {
|
||||||
|
"log_cfgs": [],
|
||||||
|
"syslog_fix_perms": [],
|
||||||
|
"mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
||||||
|
- "ssh_deletekeys": False,
|
||||||
|
- "ssh_genkeytypes": [],
|
||||||
|
"system_info": {
|
||||||
|
"paths": {
|
||||||
|
"cloud_dir": "/var/lib/cloud",
|
||||||
|
diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
|
||||||
|
index c8c2ae81..19d26ebe 100644
|
||||||
|
--- a/tests/unittests/cmd/test_main.py
|
||||||
|
+++ b/tests/unittests/cmd/test_main.py
|
||||||
|
@@ -122,8 +122,6 @@ class TestMain(FilesystemMockingTestCase):
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
"vendor_data2": {"enabled": True, "prefix": []},
|
||||||
|
"syslog_fix_perms": [],
|
||||||
|
- "ssh_deletekeys": False,
|
||||||
|
- "ssh_genkeytypes": [],
|
||||||
|
"mount_default_fields": [
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,457 +0,0 @@
|
||||||
From f4f100c0dddf1f11b239374a8dc452739b8e6a81 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
|
||||||
Date: Thu, 28 Mar 2024 14:24:08 +0000
|
|
||||||
Subject: [PATCH] Improvements for AlmaLinux OS and CloudLinux OS
|
|
||||||
|
|
||||||
Add AlmaLinux OS and CloudLinux OS support to:
|
|
||||||
|
|
||||||
Modules:
|
|
||||||
- cc_ca_certs
|
|
||||||
- cc_ntp
|
|
||||||
- cc_resolv_conf
|
|
||||||
|
|
||||||
Datasources:
|
|
||||||
- Rbx Cloud Datasource
|
|
||||||
|
|
||||||
Systemd services:
|
|
||||||
- cloud-final.service
|
|
||||||
- cloud-init-local.service
|
|
||||||
- cloud-init.service
|
|
||||||
---
|
|
||||||
cloudinit/config/cc_ca_certs.py | 8 ++++
|
|
||||||
cloudinit/config/cc_ntp.py | 11 ++---
|
|
||||||
cloudinit/config/cc_resolv_conf.py | 2 +
|
|
||||||
cloudinit/settings.py | 2 +-
|
|
||||||
cloudinit/sources/DataSourceRbxCloud.py | 2 +-
|
|
||||||
systemd/cloud-final.service.tmpl | 2 +-
|
|
||||||
systemd/cloud-init-local.service.tmpl | 10 ++--
|
|
||||||
systemd/cloud-init.service.tmpl | 2 +-
|
|
||||||
templates/chrony.conf.almalinux.tmpl | 51 ++++++++++++++++++++
|
|
||||||
templates/chrony.conf.cloudlinux.tmpl | 51 ++++++++++++++++++++
|
|
||||||
templates/ntp.conf.almalinux.tmpl | 64 +++++++++++++++++++++++++
|
|
||||||
templates/ntp.conf.cloudlinux.tmpl | 64 +++++++++++++++++++++++++
|
|
||||||
12 files changed, 252 insertions(+), 17 deletions(-)
|
|
||||||
create mode 100644 templates/chrony.conf.almalinux.tmpl
|
|
||||||
create mode 100644 templates/chrony.conf.cloudlinux.tmpl
|
|
||||||
create mode 100644 templates/ntp.conf.almalinux.tmpl
|
|
||||||
create mode 100644 templates/ntp.conf.cloudlinux.tmpl
|
|
||||||
|
|
||||||
diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py
|
|
||||||
index 8d3fd9a..4dd5843 100644
|
|
||||||
--- a/cloudinit/config/cc_ca_certs.py
|
|
||||||
+++ b/cloudinit/config/cc_ca_certs.py
|
|
||||||
@@ -57,6 +57,12 @@ for distro in (
|
|
||||||
):
|
|
||||||
DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["opensuse"]
|
|
||||||
|
|
||||||
+for distro in (
|
|
||||||
+ "almalinux",
|
|
||||||
+ "cloudlinux",
|
|
||||||
+):
|
|
||||||
+ DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["rhel"]
|
|
||||||
+
|
|
||||||
MODULE_DESCRIPTION = """\
|
|
||||||
This module adds CA certificates to the system's CA store and updates any
|
|
||||||
related files using the appropriate OS-specific utility. The default CA
|
|
||||||
@@ -72,6 +78,8 @@ configuration option ``remove_defaults``.
|
|
||||||
order to provide the ``update-ca-certificates`` command.
|
|
||||||
"""
|
|
||||||
distros = [
|
|
||||||
+ "almalinux",
|
|
||||||
+ "cloudlinux",
|
|
||||||
"alpine",
|
|
||||||
"debian",
|
|
||||||
"fedora",
|
|
||||||
diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
|
|
||||||
index 9eef24f..1015d43 100644
|
|
||||||
--- a/cloudinit/config/cc_ntp.py
|
|
||||||
+++ b/cloudinit/config/cc_ntp.py
|
|
||||||
@@ -109,14 +109,6 @@ DISTRO_CLIENT_CONFIG = {
|
|
||||||
"service_name": "ntpd",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
- "centos": {
|
|
||||||
- "ntp": {
|
|
||||||
- "service_name": "ntpd",
|
|
||||||
- },
|
|
||||||
- "chrony": {
|
|
||||||
- "service_name": "chronyd",
|
|
||||||
- },
|
|
||||||
- },
|
|
||||||
"cos": {
|
|
||||||
"chrony": {
|
|
||||||
"service_name": "chronyd",
|
|
||||||
@@ -224,6 +216,9 @@ DISTRO_CLIENT_CONFIG = {
|
|
||||||
for distro in ("opensuse-microos", "opensuse-tumbleweed", "opensuse-leap"):
|
|
||||||
DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["opensuse"]
|
|
||||||
|
|
||||||
+for distro in ("almalinux", "centos", "cloudlinux"):
|
|
||||||
+ DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["rhel"]
|
|
||||||
+
|
|
||||||
for distro in ("sle_hpc", "sle-micro"):
|
|
||||||
DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["sles"]
|
|
||||||
|
|
||||||
diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
|
|
||||||
index aa88919..4eb1d76 100644
|
|
||||||
--- a/cloudinit/config/cc_resolv_conf.py
|
|
||||||
+++ b/cloudinit/config/cc_resolv_conf.py
|
|
||||||
@@ -57,7 +57,9 @@ meta: MetaSchema = {
|
|
||||||
"title": "Configure resolv.conf",
|
|
||||||
"description": MODULE_DESCRIPTION,
|
|
||||||
"distros": [
|
|
||||||
+ "almalinux",
|
|
||||||
"alpine",
|
|
||||||
+ "cloudlinux",
|
|
||||||
"fedora",
|
|
||||||
"mariner",
|
|
||||||
"opensuse",
|
|
||||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
||||||
index 5ced21b..51cb115 100644
|
|
||||||
--- a/cloudinit/settings.py
|
|
||||||
+++ b/cloudinit/settings.py
|
|
||||||
@@ -61,7 +61,7 @@ CFG_BUILTIN = {
|
|
||||||
"cloud_dir": "/var/lib/cloud",
|
|
||||||
"templates_dir": "/etc/cloud/templates/",
|
|
||||||
},
|
|
||||||
- "distro": "rhel",
|
|
||||||
+ "distro": "almalinux",
|
|
||||||
"network": {"renderers": None},
|
|
||||||
},
|
|
||||||
"vendor_data": {"enabled": True, "prefix": []},
|
|
||||||
diff --git a/cloudinit/sources/DataSourceRbxCloud.py b/cloudinit/sources/DataSourceRbxCloud.py
|
|
||||||
index 9214f1b..14880ec 100644
|
|
||||||
--- a/cloudinit/sources/DataSourceRbxCloud.py
|
|
||||||
+++ b/cloudinit/sources/DataSourceRbxCloud.py
|
|
||||||
@@ -60,7 +60,7 @@ def _sub_arp(cmd):
|
|
||||||
|
|
||||||
def gratuitous_arp(items, distro):
|
|
||||||
source_param = "-S"
|
|
||||||
- if distro.name in ["fedora", "centos", "rhel"]:
|
|
||||||
+ if distro.name in ["almalinux", "fedora", "centos", "cloudlinux", "rhel"]:
|
|
||||||
source_param = "-s"
|
|
||||||
for item in items:
|
|
||||||
try:
|
|
||||||
diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
|
|
||||||
index bcf8b00..6d34761 100644
|
|
||||||
--- a/systemd/cloud-final.service.tmpl
|
|
||||||
+++ b/systemd/cloud-final.service.tmpl
|
|
||||||
@@ -18,7 +18,7 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
|
|
||||||
RemainAfterExit=yes
|
|
||||||
TimeoutSec=0
|
|
||||||
KillMode=process
|
|
||||||
-{% if variant == "rhel" %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
|
|
||||||
# Restart NetworkManager if it is present and running.
|
|
||||||
ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
|
|
||||||
out=$(systemctl show --property=SubState $u) || exit; \
|
|
||||||
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
|
|
||||||
index 3a1ca7f..853ae2c 100644
|
|
||||||
--- a/systemd/cloud-init-local.service.tmpl
|
|
||||||
+++ b/systemd/cloud-init-local.service.tmpl
|
|
||||||
@@ -1,23 +1,23 @@
|
|
||||||
## template:jinja
|
|
||||||
[Unit]
|
|
||||||
Description=Initial cloud-init job (pre-networking)
|
|
||||||
-{% if variant in ["ubuntu", "unknown", "debian", "rhel" ] %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "ubuntu", "unknown", "debian", "rhel" ] %}
|
|
||||||
DefaultDependencies=no
|
|
||||||
{% endif %}
|
|
||||||
Wants=network-pre.target
|
|
||||||
After=hv_kvp_daemon.service
|
|
||||||
After=systemd-remount-fs.service
|
|
||||||
-{% if variant == "rhel" %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
|
|
||||||
Requires=dbus.socket
|
|
||||||
After=dbus.socket
|
|
||||||
{% endif %}
|
|
||||||
Before=NetworkManager.service
|
|
||||||
-{% if variant == "rhel" %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
|
|
||||||
Before=network.service
|
|
||||||
{% endif %}
|
|
||||||
Before=network-pre.target
|
|
||||||
Before=shutdown.target
|
|
||||||
-{% if variant == "rhel" %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
|
|
||||||
Before=firewalld.target
|
|
||||||
Conflicts=shutdown.target
|
|
||||||
{% endif %}
|
|
||||||
@@ -32,7 +32,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
-{% if variant == "rhel" %}
|
|
||||||
+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
|
|
||||||
ExecStartPre=/bin/mkdir -p /run/cloud-init
|
|
||||||
ExecStartPre=/sbin/restorecon /run/cloud-init
|
|
||||||
ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
|
|
||||||
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
|
||||||
index bf91164..1ae88f7 100644
|
|
||||||
--- a/systemd/cloud-init.service.tmpl
|
|
||||||
+++ b/systemd/cloud-init.service.tmpl
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
## template:jinja
|
|
||||||
[Unit]
|
|
||||||
Description=Initial cloud-init job (metadata service crawler)
|
|
||||||
-{% if variant not in ["photon", "rhel"] %}
|
|
||||||
+{% if variant not in ["almalinux", "cloudlinux", "photon", "rhel"] %}
|
|
||||||
DefaultDependencies=no
|
|
||||||
{% endif %}
|
|
||||||
Wants=cloud-init-local.service
|
|
||||||
diff --git a/templates/chrony.conf.almalinux.tmpl b/templates/chrony.conf.almalinux.tmpl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..43b1f5d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/templates/chrony.conf.almalinux.tmpl
|
|
||||||
@@ -0,0 +1,51 @@
|
|
||||||
+## template:jinja
|
|
||||||
+# Use public servers from the pool.ntp.org project.
|
|
||||||
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
|
|
||||||
+{% if pools %}# pools
|
|
||||||
+{% endif %}
|
|
||||||
+{% for pool in pools -%}
|
|
||||||
+pool {{pool}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{%- if servers %}# servers
|
|
||||||
+{% endif %}
|
|
||||||
+{% for server in servers -%}
|
|
||||||
+server {{server}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for peer in peers -%}
|
|
||||||
+peer {{peer}}
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for a in allow -%}
|
|
||||||
+allow {{a}}
|
|
||||||
+{% endfor %}
|
|
||||||
+
|
|
||||||
+# Record the rate at which the system clock gains/losses time.
|
|
||||||
+driftfile /var/lib/chrony/drift
|
|
||||||
+
|
|
||||||
+# Allow the system clock to be stepped in the first three updates
|
|
||||||
+# if its offset is larger than 1 second.
|
|
||||||
+makestep 1.0 3
|
|
||||||
+
|
|
||||||
+# Enable kernel synchronization of the real-time clock (RTC).
|
|
||||||
+rtcsync
|
|
||||||
+
|
|
||||||
+# Enable hardware timestamping on all interfaces that support it.
|
|
||||||
+#hwtimestamp *
|
|
||||||
+
|
|
||||||
+# Increase the minimum number of selectable sources required to adjust
|
|
||||||
+# the system clock.
|
|
||||||
+#minsources 2
|
|
||||||
+
|
|
||||||
+# Allow NTP client access from local network.
|
|
||||||
+#allow 192.168.0.0/16
|
|
||||||
+
|
|
||||||
+# Serve time even if not synchronized to a time source.
|
|
||||||
+#local stratum 10
|
|
||||||
+
|
|
||||||
+# Specify file containing keys for NTP authentication.
|
|
||||||
+#keyfile /etc/chrony.keys
|
|
||||||
+
|
|
||||||
+# Specify directory for log files.
|
|
||||||
+logdir /var/log/chrony
|
|
||||||
+
|
|
||||||
+# Select which information is logged.
|
|
||||||
+#log measurements statistics tracking
|
|
||||||
diff --git a/templates/chrony.conf.cloudlinux.tmpl b/templates/chrony.conf.cloudlinux.tmpl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..43b1f5d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/templates/chrony.conf.cloudlinux.tmpl
|
|
||||||
@@ -0,0 +1,51 @@
|
|
||||||
+## template:jinja
|
|
||||||
+# Use public servers from the pool.ntp.org project.
|
|
||||||
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
|
|
||||||
+{% if pools %}# pools
|
|
||||||
+{% endif %}
|
|
||||||
+{% for pool in pools -%}
|
|
||||||
+pool {{pool}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{%- if servers %}# servers
|
|
||||||
+{% endif %}
|
|
||||||
+{% for server in servers -%}
|
|
||||||
+server {{server}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for peer in peers -%}
|
|
||||||
+peer {{peer}}
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for a in allow -%}
|
|
||||||
+allow {{a}}
|
|
||||||
+{% endfor %}
|
|
||||||
+
|
|
||||||
+# Record the rate at which the system clock gains/losses time.
|
|
||||||
+driftfile /var/lib/chrony/drift
|
|
||||||
+
|
|
||||||
+# Allow the system clock to be stepped in the first three updates
|
|
||||||
+# if its offset is larger than 1 second.
|
|
||||||
+makestep 1.0 3
|
|
||||||
+
|
|
||||||
+# Enable kernel synchronization of the real-time clock (RTC).
|
|
||||||
+rtcsync
|
|
||||||
+
|
|
||||||
+# Enable hardware timestamping on all interfaces that support it.
|
|
||||||
+#hwtimestamp *
|
|
||||||
+
|
|
||||||
+# Increase the minimum number of selectable sources required to adjust
|
|
||||||
+# the system clock.
|
|
||||||
+#minsources 2
|
|
||||||
+
|
|
||||||
+# Allow NTP client access from local network.
|
|
||||||
+#allow 192.168.0.0/16
|
|
||||||
+
|
|
||||||
+# Serve time even if not synchronized to a time source.
|
|
||||||
+#local stratum 10
|
|
||||||
+
|
|
||||||
+# Specify file containing keys for NTP authentication.
|
|
||||||
+#keyfile /etc/chrony.keys
|
|
||||||
+
|
|
||||||
+# Specify directory for log files.
|
|
||||||
+logdir /var/log/chrony
|
|
||||||
+
|
|
||||||
+# Select which information is logged.
|
|
||||||
+#log measurements statistics tracking
|
|
||||||
diff --git a/templates/ntp.conf.almalinux.tmpl b/templates/ntp.conf.almalinux.tmpl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9884df5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/templates/ntp.conf.almalinux.tmpl
|
|
||||||
@@ -0,0 +1,64 @@
|
|
||||||
+## template:jinja
|
|
||||||
+
|
|
||||||
+# For more information about this file, see the man pages
|
|
||||||
+# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
|
|
||||||
+
|
|
||||||
+driftfile /var/lib/ntp/drift
|
|
||||||
+
|
|
||||||
+# Permit time synchronization with our time source, but do not
|
|
||||||
+# permit the source to query or modify the service on this system.
|
|
||||||
+restrict default kod nomodify notrap nopeer noquery
|
|
||||||
+restrict -6 default kod nomodify notrap nopeer noquery
|
|
||||||
+
|
|
||||||
+# Permit all access over the loopback interface. This could
|
|
||||||
+# be tightened as well, but to do so would effect some of
|
|
||||||
+# the administrative functions.
|
|
||||||
+restrict 127.0.0.1
|
|
||||||
+restrict -6 ::1
|
|
||||||
+
|
|
||||||
+# Hosts on local network are less restricted.
|
|
||||||
+#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
|
|
||||||
+
|
|
||||||
+# Use public servers from the pool.ntp.org project.
|
|
||||||
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
|
|
||||||
+{% if pools %}# pools
|
|
||||||
+{% endif %}
|
|
||||||
+{% for pool in pools -%}
|
|
||||||
+pool {{pool}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{%- if servers %}# servers
|
|
||||||
+{% endif %}
|
|
||||||
+{% for server in servers -%}
|
|
||||||
+server {{server}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for peer in peers -%}
|
|
||||||
+peer {{peer}}
|
|
||||||
+{% endfor %}
|
|
||||||
+
|
|
||||||
+#broadcast 192.168.1.255 autokey # broadcast server
|
|
||||||
+#broadcastclient # broadcast client
|
|
||||||
+#broadcast 224.0.1.1 autokey # multicast server
|
|
||||||
+#multicastclient 224.0.1.1 # multicast client
|
|
||||||
+#manycastserver 239.255.254.254 # manycast server
|
|
||||||
+#manycastclient 239.255.254.254 autokey # manycast client
|
|
||||||
+
|
|
||||||
+# Enable public key cryptography.
|
|
||||||
+#crypto
|
|
||||||
+
|
|
||||||
+includefile /etc/ntp/crypto/pw
|
|
||||||
+
|
|
||||||
+# Key file containing the keys and key identifiers used when operating
|
|
||||||
+# with symmetric key cryptography.
|
|
||||||
+keys /etc/ntp/keys
|
|
||||||
+
|
|
||||||
+# Specify the key identifiers which are trusted.
|
|
||||||
+#trustedkey 4 8 42
|
|
||||||
+
|
|
||||||
+# Specify the key identifier to use with the ntpdc utility.
|
|
||||||
+#requestkey 8
|
|
||||||
+
|
|
||||||
+# Specify the key identifier to use with the ntpq utility.
|
|
||||||
+#controlkey 8
|
|
||||||
+
|
|
||||||
+# Enable writing of statistics records.
|
|
||||||
+#statistics clockstats cryptostats loopstats peerstats
|
|
||||||
diff --git a/templates/ntp.conf.cloudlinux.tmpl b/templates/ntp.conf.cloudlinux.tmpl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9884df5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/templates/ntp.conf.cloudlinux.tmpl
|
|
||||||
@@ -0,0 +1,64 @@
|
|
||||||
+## template:jinja
|
|
||||||
+
|
|
||||||
+# For more information about this file, see the man pages
|
|
||||||
+# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
|
|
||||||
+
|
|
||||||
+driftfile /var/lib/ntp/drift
|
|
||||||
+
|
|
||||||
+# Permit time synchronization with our time source, but do not
|
|
||||||
+# permit the source to query or modify the service on this system.
|
|
||||||
+restrict default kod nomodify notrap nopeer noquery
|
|
||||||
+restrict -6 default kod nomodify notrap nopeer noquery
|
|
||||||
+
|
|
||||||
+# Permit all access over the loopback interface. This could
|
|
||||||
+# be tightened as well, but to do so would effect some of
|
|
||||||
+# the administrative functions.
|
|
||||||
+restrict 127.0.0.1
|
|
||||||
+restrict -6 ::1
|
|
||||||
+
|
|
||||||
+# Hosts on local network are less restricted.
|
|
||||||
+#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
|
|
||||||
+
|
|
||||||
+# Use public servers from the pool.ntp.org project.
|
|
||||||
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
|
|
||||||
+{% if pools %}# pools
|
|
||||||
+{% endif %}
|
|
||||||
+{% for pool in pools -%}
|
|
||||||
+pool {{pool}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{%- if servers %}# servers
|
|
||||||
+{% endif %}
|
|
||||||
+{% for server in servers -%}
|
|
||||||
+server {{server}} iburst
|
|
||||||
+{% endfor %}
|
|
||||||
+{% for peer in peers -%}
|
|
||||||
+peer {{peer}}
|
|
||||||
+{% endfor %}
|
|
||||||
+
|
|
||||||
+#broadcast 192.168.1.255 autokey # broadcast server
|
|
||||||
+#broadcastclient # broadcast client
|
|
||||||
+#broadcast 224.0.1.1 autokey # multicast server
|
|
||||||
+#multicastclient 224.0.1.1 # multicast client
|
|
||||||
+#manycastserver 239.255.254.254 # manycast server
|
|
||||||
+#manycastclient 239.255.254.254 autokey # manycast client
|
|
||||||
+
|
|
||||||
+# Enable public key cryptography.
|
|
||||||
+#crypto
|
|
||||||
+
|
|
||||||
+includefile /etc/ntp/crypto/pw
|
|
||||||
+
|
|
||||||
+# Key file containing the keys and key identifiers used when operating
|
|
||||||
+# with symmetric key cryptography.
|
|
||||||
+keys /etc/ntp/keys
|
|
||||||
+
|
|
||||||
+# Specify the key identifiers which are trusted.
|
|
||||||
+#trustedkey 4 8 42
|
|
||||||
+
|
|
||||||
+# Specify the key identifier to use with the ntpdc utility.
|
|
||||||
+#requestkey 8
|
|
||||||
+
|
|
||||||
+# Specify the key identifier to use with the ntpq utility.
|
|
||||||
+#controlkey 8
|
|
||||||
+
|
|
||||||
+# Enable writing of statistics records.
|
|
||||||
+#statistics clockstats cryptostats loopstats peerstats
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From cc31dc321ae35995ceff93e67aaf0b0c660aa890 Mon Sep 17 00:00:00 2001
|
From 9da40a7e46e40eb090538f9d8a5aa6049fbbc5b8 Mon Sep 17 00:00:00 2001
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
Date: Tue, 12 Mar 2024 12:52:10 +0530
|
Date: Tue, 12 Mar 2024 12:52:10 +0530
|
||||||
Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
|
Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
|
||||||
|
|
||||||
RH-Author: Ani Sinha <None>
|
RH-Author: Ani Sinha <None>
|
||||||
RH-MergeRequest: 71: Retain exit code in cloud-init status for recoverable errors
|
RH-MergeRequest: 126: Retain exit code in cloud-init status for recoverable errors
|
||||||
RH-Jira: RHEL-28549
|
RH-Jira: RHEL-28817
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
RH-Commit: [1/1] 00934ade88c481c012bc1947fa44e5ed59f82858 (anisinha/cloud-init)
|
RH-Commit: [1/1] 8c45ffe77ed8e964c35af4705d65daaf8282038f
|
||||||
|
|
||||||
Version 23.4 of cloud-init changed the status code reported by cloud-init for
|
Version 23.4 of cloud-init changed the status code reported by cloud-init for
|
||||||
recoverable errors from 0 to 2. Please see the commit
|
recoverable errors from 0 to 2. Please see the commit
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
From 72b2deeafd9276d15f20831f01b2f8c44616f33d Mon Sep 17 00:00:00 2001
|
From ce17b057e4bd5dfaa2cc72991736a1b82704488c Mon Sep 17 00:00:00 2001
|
||||||
From: Brett Holman <brett.holman@canonical.com>
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
Date: Tue, 23 Jan 2024 11:47:35 -0700
|
Date: Tue, 23 Jan 2024 11:47:35 -0700
|
||||||
Subject: [PATCH] Revert "Use grep for faster parsing of cloud config in
|
Subject: [PATCH] Revert "Use grep for faster parsing of cloud config in
|
||||||
ds-identify (#4327)"
|
ds-identify (#4327)"
|
||||||
|
|
||||||
RH-Author: Ani Sinha <None>
|
RH-Author: Ani Sinha <None>
|
||||||
RH-MergeRequest: 67: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
|
RH-MergeRequest: 122: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
|
||||||
RH-Jira: RHEL-22255
|
RH-Jira: RHEL-22248
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
RH-Commit: [1/1] 5997598254cd16ea7f26d87212b0f09920fcdf50 (anisinha/cloud-init)
|
RH-Commit: [1/1] f14ebd0055aad9340249e83381cf976debdbe38d
|
||||||
|
|
||||||
This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
|
This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
|
||||||
|
|
||||||
|
@ -238,5 +238,5 @@ index 7a537278..ec2cc18a 100755
|
||||||
_RET="$ret"
|
_RET="$ret"
|
||||||
_RET_fname="$found_fn"
|
_RET_fname="$found_fn"
|
||||||
--
|
--
|
||||||
2.39.3
|
2.41.0
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
From 42aad98557bb62ae693f38e5f1e137bcc44f6046 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue, 5 Mar 2024 12:42:26 +0530
|
||||||
|
Subject: [PATCH] Revert "systemd: Standardize cloud-init systemd enablement
|
||||||
|
(#4399)"
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 124: Revert "systemd: Standardize cloud-init systemd enablement (#4399)"
|
||||||
|
RH-Jira: RHEL-21290
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [1/1] 10da53e761e25ff7d254a4cfb8fb1fd18de8b4ed
|
||||||
|
|
||||||
|
This reverts commit ec7dde8041d4023b09324e84abe37dc766ebbaf6.
|
||||||
|
|
||||||
|
'ConditionEnvironment' clause is not available in RHEL 8.10 systemd and adding
|
||||||
|
the feature would be complicated. Hence reverting the patch seems to be the
|
||||||
|
right thing to do as it was a simple enhancement to make sure all distros use
|
||||||
|
systemd's kernel commandline and file conditionals. We only care about RHEL so
|
||||||
|
the change should not affect us.
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
systemd/cloud-config.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-final.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init-local.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init.target | 3 ---
|
||||||
|
5 files changed, 8 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
|
||||||
|
index 31d9d983..76e50ae1 100644
|
||||||
|
--- a/systemd/cloud-config.service.tmpl
|
||||||
|
+++ b/systemd/cloud-config.service.tmpl
|
||||||
|
@@ -5,9 +5,10 @@ After=network-online.target cloud-config.target
|
||||||
|
After=snapd.seeded.service
|
||||||
|
Before=systemd-user-sessions.service
|
||||||
|
Wants=network-online.target cloud-config.target
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
|
||||||
|
index bcf8b009..85f423ac 100644
|
||||||
|
--- a/systemd/cloud-final.service.tmpl
|
||||||
|
+++ b/systemd/cloud-final.service.tmpl
|
||||||
|
@@ -7,9 +7,10 @@ After=multi-user.target
|
||||||
|
Before=apt-daily.service
|
||||||
|
{% endif %}
|
||||||
|
Wants=network-online.target cloud-config.service
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
|
||||||
|
index 3a1ca7fa..6f3f9d8d 100644
|
||||||
|
--- a/systemd/cloud-init-local.service.tmpl
|
||||||
|
+++ b/systemd/cloud-init-local.service.tmpl
|
||||||
|
@@ -26,9 +26,10 @@ Before=sysinit.target
|
||||||
|
Conflicts=shutdown.target
|
||||||
|
{% endif %}
|
||||||
|
RequiresMountsFor=/var/lib/cloud
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
||||||
|
index bf91164a..26d2e39c 100644
|
||||||
|
--- a/systemd/cloud-init.service.tmpl
|
||||||
|
+++ b/systemd/cloud-init.service.tmpl
|
||||||
|
@@ -38,9 +38,10 @@ Conflicts=shutdown.target
|
||||||
|
Before=shutdown.target
|
||||||
|
Conflicts=shutdown.target
|
||||||
|
{% endif %}
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
|
||||||
|
index 30450f7f..760dfee5 100644
|
||||||
|
--- a/systemd/cloud-init.target
|
||||||
|
+++ b/systemd/cloud-init.target
|
||||||
|
@@ -10,6 +10,3 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Cloud-init target
|
||||||
|
After=multi-user.target
|
||||||
|
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
-ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -1,13 +1,20 @@
|
||||||
From 7f3b0ff968409a880596e04aece4e4c504fb9c64 Mon Sep 17 00:00:00 2001
|
From 3f138f68a36224dcefd5c16befbc00486b09c8ec Mon Sep 17 00:00:00 2001
|
||||||
From: Brett Holman <brett.holman@canonical.com>
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
Date: Mon, 29 Jan 2024 12:03:36 -0700
|
Date: Mon, 29 Jan 2024 12:03:36 -0700
|
||||||
Subject: [PATCH] ci: Pin pytest<8.0.0. (#4816)
|
Subject: [PATCH 1/2] ci: Pin pytest<8.0.0. (#4816)
|
||||||
|
|
||||||
|
RH-Author: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
|
||||||
|
RH-Jira: RHEL-21323
|
||||||
|
RH-Acked-by: Ani Sinha <None>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/2] db0348f73893a7bb536e4a3562dc7ef33b2590ad
|
||||||
|
|
||||||
The latest pytest release broke some tests in non-obvious ways. Pin
|
The latest pytest release broke some tests in non-obvious ways. Pin
|
||||||
the version for now so that CI passes.
|
the version for now so that CI passes.
|
||||||
|
|
||||||
(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447)
|
(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447)
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
---
|
---
|
||||||
integration-requirements.txt | 2 +-
|
integration-requirements.txt | 2 +-
|
||||||
test-requirements.txt | 2 +-
|
test-requirements.txt | 2 +-
|
|
@ -1,207 +0,0 @@
|
||||||
From c21351ad9da5aebcb252aa36cbfa92ac16fa9746 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Florian Apolloner <florian@apolloner.eu>
|
|
||||||
Date: Fri, 5 Jan 2024 19:07:12 +0100
|
|
||||||
Subject: [PATCH 2/3] feat: apply global DNS to interfaces in network-manager
|
|
||||||
(#4723)
|
|
||||||
|
|
||||||
RH-Author: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-MergeRequest: 72: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
|
|
||||||
RH-Jira: RHEL-20964
|
|
||||||
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
RH-Commit: [2/2] 1d2b10133ec2558e9665f21f53e4b1a898e283a8 (cavery/cloud-init-c-9-s)
|
|
||||||
|
|
||||||
Sometimes DNS settings in cloud configs are specified globally and
|
|
||||||
not per interface / subnet. This results in a configuration without
|
|
||||||
proper nameservers. This was fixed for netplan in d29eeccd and is
|
|
||||||
now also applied to the network-manager renderer.
|
|
||||||
|
|
||||||
Co-authored-by: James Falcon <james.falcon@canonical.com>
|
|
||||||
(cherry picked from commit 0d787d0a262f70ff848b315633742aa8fc45a1de)
|
|
||||||
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/net/network_manager.py | 52 ++++++++++++++---------
|
|
||||||
tests/unittests/net/test_net_rendering.py | 3 ++
|
|
||||||
tests/unittests/test_net.py | 11 +++++
|
|
||||||
tools/.github-cla-signers | 1 +
|
|
||||||
4 files changed, 47 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
|
||||||
index bd6e6d75..0ba210b7 100644
|
|
||||||
--- a/cloudinit/net/network_manager.py
|
|
||||||
+++ b/cloudinit/net/network_manager.py
|
|
||||||
@@ -246,7 +246,7 @@ class NMConnection:
|
|
||||||
"""
|
|
||||||
return addr.replace("-", ":").upper()
|
|
||||||
|
|
||||||
- def render_interface(self, iface, renderer):
|
|
||||||
+ def render_interface(self, iface, network_state, renderer):
|
|
||||||
"""
|
|
||||||
Integrate information from network state interface information
|
|
||||||
into the connection. Most of the work is done here.
|
|
||||||
@@ -311,7 +311,6 @@ class NMConnection:
|
|
||||||
found_dns_search = []
|
|
||||||
|
|
||||||
# Deal with Layer 3 configuration
|
|
||||||
- use_top_level_dns = "dns" in iface
|
|
||||||
for subnet in iface["subnets"]:
|
|
||||||
family = "ipv6" if subnet_is_ipv6(subnet) else "ipv4"
|
|
||||||
|
|
||||||
@@ -322,26 +321,39 @@ class NMConnection:
|
|
||||||
self.config[family]["gateway"] = subnet["gateway"]
|
|
||||||
for route in subnet["routes"]:
|
|
||||||
self._add_route(route)
|
|
||||||
- if not use_top_level_dns and "dns_nameservers" in subnet:
|
|
||||||
- for nameserver in subnet["dns_nameservers"]:
|
|
||||||
- found_nameservers.append(nameserver)
|
|
||||||
- if not use_top_level_dns and "dns_search" in subnet:
|
|
||||||
- found_dns_search.append(subnet["dns_search"])
|
|
||||||
+ # Add subnet-level DNS
|
|
||||||
+ if "dns_nameservers" in subnet:
|
|
||||||
+ found_nameservers.extend(subnet["dns_nameservers"])
|
|
||||||
+ if "dns_search" in subnet:
|
|
||||||
+ found_dns_search.extend(subnet["dns_search"])
|
|
||||||
if family == "ipv4" and "mtu" in subnet:
|
|
||||||
ipv4_mtu = subnet["mtu"]
|
|
||||||
|
|
||||||
- # Now add our DNS search domains. We add them later because we
|
|
||||||
- # only want them if an IP family has already been defined
|
|
||||||
- if use_top_level_dns:
|
|
||||||
- for nameserver in iface["dns"]["nameservers"]:
|
|
||||||
- self._add_nameserver(nameserver)
|
|
||||||
- if iface["dns"]["search"]:
|
|
||||||
- self._add_dns_search(iface["dns"]["search"])
|
|
||||||
- else:
|
|
||||||
- for nameserver in found_nameservers:
|
|
||||||
- self._add_nameserver(nameserver)
|
|
||||||
- for dns_search in found_dns_search:
|
|
||||||
- self._add_dns_search(dns_search)
|
|
||||||
+ # Add interface-level DNS
|
|
||||||
+ if "dns" in iface:
|
|
||||||
+ found_nameservers += [
|
|
||||||
+ dns
|
|
||||||
+ for dns in iface["dns"]["nameservers"]
|
|
||||||
+ if dns not in found_nameservers
|
|
||||||
+ ]
|
|
||||||
+ found_dns_search += [
|
|
||||||
+ search
|
|
||||||
+ for search in iface["dns"]["search"]
|
|
||||||
+ if search not in found_dns_search
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+ # We prefer any interface-specific DNS entries, but if we do not
|
|
||||||
+ # have any, add the global DNS to the connection
|
|
||||||
+ if not found_nameservers and network_state.dns_nameservers:
|
|
||||||
+ found_nameservers = network_state.dns_nameservers
|
|
||||||
+ if not found_dns_search and network_state.dns_searchdomains:
|
|
||||||
+ found_dns_search = network_state.dns_searchdomains
|
|
||||||
+
|
|
||||||
+ # Write out all DNS entries to the connection
|
|
||||||
+ for nameserver in found_nameservers:
|
|
||||||
+ self._add_nameserver(nameserver)
|
|
||||||
+ if found_dns_search:
|
|
||||||
+ self._add_dns_search(found_dns_search)
|
|
||||||
|
|
||||||
# we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
|
|
||||||
# at the at the same time. This will make the network configuration
|
|
||||||
@@ -457,7 +469,7 @@ class Renderer(renderer.Renderer):
|
|
||||||
# Now render the actual interface configuration
|
|
||||||
for iface in network_state.iter_interfaces():
|
|
||||||
conn = self.connections[iface["name"]]
|
|
||||||
- conn.render_interface(iface, self)
|
|
||||||
+ conn.render_interface(iface, network_state, self)
|
|
||||||
|
|
||||||
# And finally write the files
|
|
||||||
for con_id, conn in self.connections.items():
|
|
||||||
diff --git a/tests/unittests/net/test_net_rendering.py b/tests/unittests/net/test_net_rendering.py
|
|
||||||
index 06feab89..f340ffc1 100644
|
|
||||||
--- a/tests/unittests/net/test_net_rendering.py
|
|
||||||
+++ b/tests/unittests/net/test_net_rendering.py
|
|
||||||
@@ -88,6 +88,9 @@ def _check_network_manager(network_state: NetworkState, tmp_path: Path):
|
|
||||||
"test_name, renderers",
|
|
||||||
[("no_matching_mac_v2", Renderer.Netplan | Renderer.NetworkManager)],
|
|
||||||
)
|
|
||||||
+@pytest.mark.xfail(
|
|
||||||
+ reason="v2 interface-specific DNS errantly gets applied globally"
|
|
||||||
+)
|
|
||||||
def test_convert(test_name, renderers, tmp_path):
|
|
||||||
network_config = safeyaml.load(
|
|
||||||
Path(ARTIFACT_DIR, f"{test_name}.yaml").read_text()
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index 2a99f150..d7c9a414 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -646,6 +646,7 @@ method=manual
|
|
||||||
may-fail=false
|
|
||||||
address1=172.19.1.34/22
|
|
||||||
route1=0.0.0.0/0,172.19.3.254
|
|
||||||
+dns=172.19.0.12;
|
|
||||||
|
|
||||||
""".lstrip(),
|
|
||||||
),
|
|
||||||
@@ -2797,6 +2798,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
[ipv4]
|
|
||||||
method=auto
|
|
||||||
may-fail=false
|
|
||||||
+ dns=8.8.8.8;4.4.4.4;8.8.4.4;
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
@@ -2822,6 +2825,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
method=manual
|
|
||||||
may-fail=false
|
|
||||||
address1=192.168.200.7/24
|
|
||||||
+ dns=8.8.8.8;4.4.4.4;8.8.4.4;
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
@@ -2846,6 +2851,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
[ipv4]
|
|
||||||
method=auto
|
|
||||||
may-fail=false
|
|
||||||
+ dns=8.8.8.8;4.4.4.4;8.8.4.4;
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
@@ -2930,12 +2937,15 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
method=manual
|
|
||||||
may-fail=false
|
|
||||||
address1=192.168.14.2/24
|
|
||||||
+ dns=8.8.8.8;4.4.4.4;8.8.4.4;
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
[ipv6]
|
|
||||||
method=manual
|
|
||||||
may-fail=false
|
|
||||||
address1=2001:1::1/64
|
|
||||||
route1=::/0,2001:4800:78ff:1b::1
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
@@ -2990,6 +3000,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
[ipv6]
|
|
||||||
method=auto
|
|
||||||
may-fail=false
|
|
||||||
+ dns-search=barley.maas;wark.maas;foobar.maas;
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
|
|
||||||
index dbdb9cfa..f4da0989 100644
|
|
||||||
--- a/tools/.github-cla-signers
|
|
||||||
+++ b/tools/.github-cla-signers
|
|
||||||
@@ -13,6 +13,7 @@ andrewbogott
|
|
||||||
andrewlukoshko
|
|
||||||
ani-sinha
|
|
||||||
antonyc
|
|
||||||
+apollo13
|
|
||||||
aswinrajamannar
|
|
||||||
bdrung
|
|
||||||
beantaxi
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
From 2f7f3dc6237ea70825dcb70f71d9718f631a9d95 Mon Sep 17 00:00:00 2001
|
From 720faf533832ba758dcc8436f144168996508c2a Mon Sep 17 00:00:00 2001
|
||||||
From: James Falcon <james.falcon@canonical.com>
|
From: James Falcon <james.falcon@canonical.com>
|
||||||
Date: Tue, 6 Feb 2024 09:24:37 -0600
|
Date: Tue, 6 Feb 2024 09:24:37 -0600
|
||||||
Subject: [PATCH] fix: Add types to network v1 schema (#4841)
|
Subject: [PATCH 2/2] fix: Add types to network v1 schema (#4841)
|
||||||
|
|
||||||
RH-Author: Cathy Avery <cavery@redhat.com>
|
RH-Author: Cathy Avery <cavery@redhat.com>
|
||||||
RH-MergeRequest: 69: fix: Add types to network v1 schema (#4841)
|
RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
|
||||||
RH-Jira: RHEL-21324
|
RH-Jira: RHEL-21323
|
||||||
RH-Acked-by: Ani Sinha <None>
|
RH-Acked-by: Ani Sinha <None>
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
RH-Commit: [1/1] 59b2b4b07dd9eed956943a22b90af487f18b4cbd (cavery/cloud-init-c-9-s)
|
RH-Commit: [2/2] a73a68dff5a6ef54dc4e3b3527fc778400a461cc
|
||||||
|
|
||||||
Conflicts:
|
Conflicts:
|
||||||
No log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
|
For RHEL no log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
|
||||||
|
|
||||||
Even though it has conflicted with our documentation, we have allowed
|
Even though it has conflicted with our documentation, we have allowed
|
||||||
nameserver address to a be a string, mtu to be empty, and nameserver
|
nameserver address to a be a string, mtu to be empty, and nameserver
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
From 62cec1e38e117fe6b24888862576ac57be14bbda Mon Sep 17 00:00:00 2001
|
|
||||||
From: James Falcon <james.falcon@canonical.com>
|
|
||||||
Date: Tue, 26 Mar 2024 15:55:50 -0500
|
|
||||||
Subject: [PATCH] fix: Always use single datasource if specified (#5098)
|
|
||||||
|
|
||||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
|
||||||
RH-MergeRequest: 82: fix: Always use single datasource if specified (#5098)
|
|
||||||
RH-Jira: RHEL-36255
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
RH-Commit: [1/1] 068e97fcc18dd99f1112a9109acdb30fe2880f6e (anisinha/cloud-init)
|
|
||||||
|
|
||||||
This change may require a user to add `None` to the `datasource_list`
|
|
||||||
defined in `/etc/cloud/cloud.cfg[.d]` if they have a customized
|
|
||||||
datasource_list and want the DataSourceNone fallback behavior.
|
|
||||||
|
|
||||||
ds-identify would automatically append "None" to the datasource_list
|
|
||||||
if a single entry was provided in /etc/cloud/cloud.cfg[.d].
|
|
||||||
This wasn't a problem in the past as the python code would detect
|
|
||||||
a single datasource along with None as an indication to automatically
|
|
||||||
use that datasource. Since the python code no longer does that,
|
|
||||||
we should ensure that one specified datasource results in one specified
|
|
||||||
datasource after ds-identify has run.
|
|
||||||
|
|
||||||
Fixes GH-5091
|
|
||||||
|
|
||||||
(cherry picked from commit cdbbd17ae400e432d13f674c18a6f5c873fa328b)
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
---
|
|
||||||
tests/unittests/test_ds_identify.py | 2 +-
|
|
||||||
tools/ds-identify | 6 +++++-
|
|
||||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
|
|
||||||
index ba0bf779..acbf3f03 100644
|
|
||||||
--- a/tests/unittests/test_ds_identify.py
|
|
||||||
+++ b/tests/unittests/test_ds_identify.py
|
|
||||||
@@ -522,7 +522,7 @@ class TestDsIdentify(DsIdentifyBase):
|
|
||||||
mydata = copy.deepcopy(VALID_CFG["Ec2-hvm"])
|
|
||||||
cfgpath = "etc/cloud/cloud.cfg.d/myds.cfg"
|
|
||||||
mydata["files"][cfgpath] = 'datasource_list: ["NoCloud"]\n'
|
|
||||||
- self._check_via_dict(mydata, rc=RC_FOUND, dslist=["NoCloud", DS_NONE])
|
|
||||||
+ self._check_via_dict(mydata, rc=RC_FOUND, dslist=["NoCloud"])
|
|
||||||
|
|
||||||
def test_configured_list_with_none(self):
|
|
||||||
"""When datasource_list already contains None, None is not added.
|
|
||||||
diff --git a/tools/ds-identify b/tools/ds-identify
|
|
||||||
index ec2cc18a..6e49ded3 100755
|
|
||||||
--- a/tools/ds-identify
|
|
||||||
+++ b/tools/ds-identify
|
|
||||||
@@ -1865,7 +1865,11 @@ _main() {
|
|
||||||
# if there is only a single entry in $DI_DSLIST
|
|
||||||
if [ $# -eq 1 ] || [ $# -eq 2 -a "$2" = "None" ] ; then
|
|
||||||
debug 1 "single entry in datasource_list ($DI_DSLIST) use that."
|
|
||||||
- found "$@"
|
|
||||||
+ if [ $# -eq 1 ]; then
|
|
||||||
+ write_result "datasource_list: [ $1 ]"
|
|
||||||
+ else
|
|
||||||
+ found "$@"
|
|
||||||
+ fi
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -1,391 +0,0 @@
|
||||||
From aaf1d063f198ce09f0d539a85e1a1a2bb834520b Mon Sep 17 00:00:00 2001
|
|
||||||
From: James Falcon <james.falcon@canonical.com>
|
|
||||||
Date: Tue, 2 Jan 2024 11:29:17 -0600
|
|
||||||
Subject: [PATCH 1/3] fix: Correct v2 NetworkManager route rendering (#4637)
|
|
||||||
|
|
||||||
RH-Author: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-MergeRequest: 72: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
|
|
||||||
RH-Jira: RHEL-20964
|
|
||||||
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
RH-Commit: [1/2] fb865987dbcf506a674eb9798f9c06859539a696 (cavery/cloud-init-c-9-s)
|
|
||||||
|
|
||||||
fix: Correct v2 NetworkManager route rendering
|
|
||||||
|
|
||||||
Because network v2 route defintions can have mixed v4 and v6 routes, we
|
|
||||||
need to determine the IP family per route rather than per subnet.
|
|
||||||
|
|
||||||
Similar, ensure dns-search is rendered correctly.
|
|
||||||
|
|
||||||
Fixes GH-4518
|
|
||||||
|
|
||||||
(cherry picked from commit c2c100e8c9fd8709539b3ab2b0ee34c66ba3f2f7)
|
|
||||||
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/net/__init__.py | 2 +
|
|
||||||
cloudinit/net/network_manager.py | 87 +++++++++-------
|
|
||||||
tests/unittests/test_net.py | 165 ++++++++++++++++++++++++++++++-
|
|
||||||
3 files changed, 219 insertions(+), 35 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
|
|
||||||
index c0888f52..65e7ff33 100644
|
|
||||||
--- a/cloudinit/net/__init__.py
|
|
||||||
+++ b/cloudinit/net/__init__.py
|
|
||||||
@@ -1287,6 +1287,8 @@ def subnet_is_ipv6(subnet) -> bool:
|
|
||||||
"""Common helper for checking network_state subnets for ipv6."""
|
|
||||||
# 'static6', 'dhcp6', 'ipv6_dhcpv6-stateful', 'ipv6_dhcpv6-stateless' or
|
|
||||||
# 'ipv6_slaac'
|
|
||||||
+ # This function is inappropriate for v2-based routes as routes defined
|
|
||||||
+ # under v2 subnets can contain ipv4 and ipv6 simultaneously
|
|
||||||
if subnet["type"].endswith("6") or subnet["type"] in IPV6_DYNAMIC_TYPES:
|
|
||||||
# This is a request either static6 type or DHCPv6.
|
|
||||||
return True
|
|
||||||
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
|
||||||
index 76a0ac15..bd6e6d75 100644
|
|
||||||
--- a/cloudinit/net/network_manager.py
|
|
||||||
+++ b/cloudinit/net/network_manager.py
|
|
||||||
@@ -12,10 +12,15 @@ import itertools
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
import uuid
|
|
||||||
-from typing import Optional
|
|
||||||
+from typing import List, Optional
|
|
||||||
|
|
||||||
from cloudinit import subp, util
|
|
||||||
-from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
|
|
||||||
+from cloudinit.net import (
|
|
||||||
+ is_ipv6_address,
|
|
||||||
+ is_ipv6_network,
|
|
||||||
+ renderer,
|
|
||||||
+ subnet_is_ipv6,
|
|
||||||
+)
|
|
||||||
from cloudinit.net.network_state import NetworkState
|
|
||||||
from cloudinit.net.sysconfig import available_nm_ifcfg_rh
|
|
||||||
|
|
||||||
@@ -158,11 +163,11 @@ class NMConnection:
|
|
||||||
if self.config[family]["method"] == "auto" and method == "manual":
|
|
||||||
return
|
|
||||||
|
|
||||||
- if (
|
|
||||||
- subnet_type == "ipv6_dhcpv6-stateful"
|
|
||||||
- or subnet_type == "ipv6_dhcpv6-stateless"
|
|
||||||
- or subnet_type == "ipv6_slaac"
|
|
||||||
- ):
|
|
||||||
+ if subnet_type in [
|
|
||||||
+ "ipv6_dhcpv6-stateful",
|
|
||||||
+ "ipv6_dhcpv6-stateless",
|
|
||||||
+ "ipv6_slaac",
|
|
||||||
+ ]:
|
|
||||||
# set ipv4 method to 'disabled' to align with sysconfig renderer.
|
|
||||||
self._set_default("ipv4", "method", "disabled")
|
|
||||||
|
|
||||||
@@ -174,7 +179,8 @@ class NMConnection:
|
|
||||||
Adds a numbered property, such as address<n> or route<n>, ensuring
|
|
||||||
the appropriate value gets used for <n>.
|
|
||||||
"""
|
|
||||||
-
|
|
||||||
+ if not self.config.has_section(section):
|
|
||||||
+ self.config[section] = {}
|
|
||||||
for index in itertools.count(1):
|
|
||||||
key = f"{key_prefix}{index}"
|
|
||||||
if not self.config.has_option(section, key):
|
|
||||||
@@ -189,40 +195,37 @@ class NMConnection:
|
|
||||||
value = subnet["address"] + "/" + str(subnet["prefix"])
|
|
||||||
self._add_numbered(family, "address", value)
|
|
||||||
|
|
||||||
- def _add_route(self, family, route):
|
|
||||||
- """
|
|
||||||
- Adds a ipv[46].route<n> property.
|
|
||||||
- """
|
|
||||||
-
|
|
||||||
+ def _add_route(self, route):
|
|
||||||
+ """Adds a ipv[46].route<n> property."""
|
|
||||||
+ # Because network v2 route definitions can have mixed v4 and v6
|
|
||||||
+ # routes, determine the family per route based on the gateway
|
|
||||||
+ family = "ipv6" if is_ipv6_network(route["gateway"]) else "ipv4"
|
|
||||||
value = route["network"] + "/" + str(route["prefix"])
|
|
||||||
if "gateway" in route:
|
|
||||||
value = value + "," + route["gateway"]
|
|
||||||
self._add_numbered(family, "route", value)
|
|
||||||
|
|
||||||
- def _add_nameserver(self, dns):
|
|
||||||
+ def _add_nameserver(self, dns: str) -> None:
|
|
||||||
"""
|
|
||||||
Extends the ipv[46].dns property with a name server.
|
|
||||||
"""
|
|
||||||
-
|
|
||||||
- # FIXME: the subnet contains IPv4 and IPv6 name server mixed
|
|
||||||
- # together. We might be getting an IPv6 name server while
|
|
||||||
- # we're dealing with an IPv4 subnet. Sort this out by figuring
|
|
||||||
- # out the correct family and making sure a valid section exist.
|
|
||||||
family = "ipv6" if is_ipv6_address(dns) else "ipv4"
|
|
||||||
- self._set_default(family, "method", "disabled")
|
|
||||||
-
|
|
||||||
- self._set_default(family, "dns", "")
|
|
||||||
- self.config[family]["dns"] = self.config[family]["dns"] + dns + ";"
|
|
||||||
+ if self.config.has_section(family):
|
|
||||||
+ self._set_default(family, "dns", "")
|
|
||||||
+ self.config[family]["dns"] = self.config[family]["dns"] + dns + ";"
|
|
||||||
|
|
||||||
- def _add_dns_search(self, family, dns_search):
|
|
||||||
+ def _add_dns_search(self, dns_search: List[str]) -> None:
|
|
||||||
"""
|
|
||||||
Extends the ipv[46].dns-search property with a name server.
|
|
||||||
"""
|
|
||||||
-
|
|
||||||
- self._set_default(family, "dns-search", "")
|
|
||||||
- self.config[family]["dns-search"] = (
|
|
||||||
- self.config[family]["dns-search"] + ";".join(dns_search) + ";"
|
|
||||||
- )
|
|
||||||
+ for family in ["ipv4", "ipv6"]:
|
|
||||||
+ if self.config.has_section(family):
|
|
||||||
+ self._set_default(family, "dns-search", "")
|
|
||||||
+ self.config[family]["dns-search"] = (
|
|
||||||
+ self.config[family]["dns-search"]
|
|
||||||
+ + ";".join(dns_search)
|
|
||||||
+ + ";"
|
|
||||||
+ )
|
|
||||||
|
|
||||||
def con_uuid(self):
|
|
||||||
"""
|
|
||||||
@@ -304,8 +307,11 @@ class NMConnection:
|
|
||||||
|
|
||||||
device_mtu = iface["mtu"]
|
|
||||||
ipv4_mtu = None
|
|
||||||
+ found_nameservers = []
|
|
||||||
+ found_dns_search = []
|
|
||||||
|
|
||||||
# Deal with Layer 3 configuration
|
|
||||||
+ use_top_level_dns = "dns" in iface
|
|
||||||
for subnet in iface["subnets"]:
|
|
||||||
family = "ipv6" if subnet_is_ipv6(subnet) else "ipv4"
|
|
||||||
|
|
||||||
@@ -315,15 +321,28 @@ class NMConnection:
|
|
||||||
if "gateway" in subnet:
|
|
||||||
self.config[family]["gateway"] = subnet["gateway"]
|
|
||||||
for route in subnet["routes"]:
|
|
||||||
- self._add_route(family, route)
|
|
||||||
- if "dns_nameservers" in subnet:
|
|
||||||
+ self._add_route(route)
|
|
||||||
+ if not use_top_level_dns and "dns_nameservers" in subnet:
|
|
||||||
for nameserver in subnet["dns_nameservers"]:
|
|
||||||
- self._add_nameserver(nameserver)
|
|
||||||
- if "dns_search" in subnet:
|
|
||||||
- self._add_dns_search(family, subnet["dns_search"])
|
|
||||||
+ found_nameservers.append(nameserver)
|
|
||||||
+ if not use_top_level_dns and "dns_search" in subnet:
|
|
||||||
+ found_dns_search.append(subnet["dns_search"])
|
|
||||||
if family == "ipv4" and "mtu" in subnet:
|
|
||||||
ipv4_mtu = subnet["mtu"]
|
|
||||||
|
|
||||||
+ # Now add our DNS search domains. We add them later because we
|
|
||||||
+ # only want them if an IP family has already been defined
|
|
||||||
+ if use_top_level_dns:
|
|
||||||
+ for nameserver in iface["dns"]["nameservers"]:
|
|
||||||
+ self._add_nameserver(nameserver)
|
|
||||||
+ if iface["dns"]["search"]:
|
|
||||||
+ self._add_dns_search(iface["dns"]["search"])
|
|
||||||
+ else:
|
|
||||||
+ for nameserver in found_nameservers:
|
|
||||||
+ self._add_nameserver(nameserver)
|
|
||||||
+ for dns_search in found_dns_search:
|
|
||||||
+ self._add_dns_search(dns_search)
|
|
||||||
+
|
|
||||||
# we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
|
|
||||||
# at the at the same time. This will make the network configuration
|
|
||||||
# work only when both ipv4 and ipv6 dhcp succeeds. This may not be
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index d9ef493b..2a99f150 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -2962,9 +2962,9 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
may-fail=false
|
|
||||||
address1=192.168.0.2/24
|
|
||||||
gateway=192.168.0.1
|
|
||||||
+ address2=192.168.2.10/24
|
|
||||||
dns=192.168.0.10;10.23.23.134;
|
|
||||||
dns-search=barley.maas;sacchromyces.maas;brettanomyces.maas;
|
|
||||||
- address2=192.168.2.10/24
|
|
||||||
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
@@ -4154,6 +4154,148 @@ iface bond0 inet6 static
|
|
||||||
"""
|
|
||||||
),
|
|
||||||
},
|
|
||||||
+ "v2-mixed-routes": {
|
|
||||||
+ "expected_network_manager": {
|
|
||||||
+ "cloud-init-eth0.nmconnection": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ # Generated by cloud-init. Changes will be lost.
|
|
||||||
+
|
|
||||||
+ [connection]
|
|
||||||
+ id=cloud-init eth0
|
|
||||||
+ uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
|
|
||||||
+ autoconnect-priority=120
|
|
||||||
+ type=ethernet
|
|
||||||
+ interface-name=eth0
|
|
||||||
+
|
|
||||||
+ [user]
|
|
||||||
+ org.freedesktop.NetworkManager.origin=cloud-init
|
|
||||||
+
|
|
||||||
+ [ethernet]
|
|
||||||
+
|
|
||||||
+ [ipv4]
|
|
||||||
+ method=auto
|
|
||||||
+ may-fail=true
|
|
||||||
+ route1=169.254.42.42/32,62.210.0.1
|
|
||||||
+ route2=169.254.42.43/32,62.210.0.2
|
|
||||||
+ address1=192.168.1.20/16
|
|
||||||
+ dns=8.8.8.8;
|
|
||||||
+ dns-search=lab;home;
|
|
||||||
+
|
|
||||||
+ [ipv6]
|
|
||||||
+ route1=::/0,fe80::dc00:ff:fe20:186
|
|
||||||
+ route2=fe80::dc00:ff:fe20:188/64,fe80::dc00:ff:fe20:187
|
|
||||||
+ method=auto
|
|
||||||
+ may-fail=true
|
|
||||||
+ address1=2001:bc8:1210:232:dc00:ff:fe20:185/64
|
|
||||||
+ dns=FEDC::1;
|
|
||||||
+ dns-search=lab;home;
|
|
||||||
+
|
|
||||||
+ """
|
|
||||||
+ )
|
|
||||||
+ },
|
|
||||||
+ "yaml": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ version: 2
|
|
||||||
+ ethernets:
|
|
||||||
+ eth0:
|
|
||||||
+ dhcp4: true
|
|
||||||
+ dhcp6: true
|
|
||||||
+ nameservers:
|
|
||||||
+ search: [lab, home]
|
|
||||||
+ addresses: [8.8.8.8, "FEDC::1"]
|
|
||||||
+ routes:
|
|
||||||
+ - to: 169.254.42.42/32
|
|
||||||
+ via: 62.210.0.1
|
|
||||||
+ - via: fe80::dc00:ff:fe20:186
|
|
||||||
+ to: ::/0
|
|
||||||
+ - to: 169.254.42.43/32
|
|
||||||
+ via: 62.210.0.2
|
|
||||||
+ - via: fe80::dc00:ff:fe20:187
|
|
||||||
+ to: fe80::dc00:ff:fe20:188
|
|
||||||
+ addresses:
|
|
||||||
+ - 192.168.1.20/16
|
|
||||||
+ - 2001:bc8:1210:232:dc00:ff:fe20:185/64
|
|
||||||
+ """
|
|
||||||
+ ),
|
|
||||||
+ },
|
|
||||||
+ "v2-dns-no-if-ips": {
|
|
||||||
+ "expected_network_manager": {
|
|
||||||
+ "cloud-init-eth0.nmconnection": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ # Generated by cloud-init. Changes will be lost.
|
|
||||||
+
|
|
||||||
+ [connection]
|
|
||||||
+ id=cloud-init eth0
|
|
||||||
+ uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
|
|
||||||
+ autoconnect-priority=120
|
|
||||||
+ type=ethernet
|
|
||||||
+ interface-name=eth0
|
|
||||||
+
|
|
||||||
+ [user]
|
|
||||||
+ org.freedesktop.NetworkManager.origin=cloud-init
|
|
||||||
+
|
|
||||||
+ [ethernet]
|
|
||||||
+
|
|
||||||
+ [ipv4]
|
|
||||||
+ method=auto
|
|
||||||
+ may-fail=true
|
|
||||||
+ dns=8.8.8.8;
|
|
||||||
+ dns-search=lab;home;
|
|
||||||
+
|
|
||||||
+ [ipv6]
|
|
||||||
+ method=auto
|
|
||||||
+ may-fail=true
|
|
||||||
+ dns=FEDC::1;
|
|
||||||
+ dns-search=lab;home;
|
|
||||||
+
|
|
||||||
+ """
|
|
||||||
+ )
|
|
||||||
+ },
|
|
||||||
+ "yaml": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ version: 2
|
|
||||||
+ ethernets:
|
|
||||||
+ eth0:
|
|
||||||
+ dhcp4: true
|
|
||||||
+ dhcp6: true
|
|
||||||
+ nameservers:
|
|
||||||
+ search: [lab, home]
|
|
||||||
+ addresses: [8.8.8.8, "FEDC::1"]
|
|
||||||
+ """
|
|
||||||
+ ),
|
|
||||||
+ },
|
|
||||||
+ "v2-dns-no-dhcp": {
|
|
||||||
+ "expected_network_manager": {
|
|
||||||
+ "cloud-init-eth0.nmconnection": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ # Generated by cloud-init. Changes will be lost.
|
|
||||||
+
|
|
||||||
+ [connection]
|
|
||||||
+ id=cloud-init eth0
|
|
||||||
+ uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
|
|
||||||
+ autoconnect-priority=120
|
|
||||||
+ type=ethernet
|
|
||||||
+ interface-name=eth0
|
|
||||||
+
|
|
||||||
+ [user]
|
|
||||||
+ org.freedesktop.NetworkManager.origin=cloud-init
|
|
||||||
+
|
|
||||||
+ [ethernet]
|
|
||||||
+
|
|
||||||
+ """
|
|
||||||
+ )
|
|
||||||
+ },
|
|
||||||
+ "yaml": textwrap.dedent(
|
|
||||||
+ """\
|
|
||||||
+ version: 2
|
|
||||||
+ ethernets:
|
|
||||||
+ eth0:
|
|
||||||
+ nameservers:
|
|
||||||
+ search: [lab, home]
|
|
||||||
+ addresses: [8.8.8.8, "FEDC::1"]
|
|
||||||
+ """
|
|
||||||
+ ),
|
|
||||||
+ },
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -6267,6 +6409,27 @@ class TestNetworkManagerRendering(CiTestCase):
|
|
||||||
entry[self.expected_name], self.expected_conf_d, found
|
|
||||||
)
|
|
||||||
|
|
||||||
+ def test_v2_mixed_routes(self):
|
|
||||||
+ entry = NETWORK_CONFIGS["v2-mixed-routes"]
|
|
||||||
+ found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
|
|
||||||
+ self._compare_files_to_expected(
|
|
||||||
+ entry[self.expected_name], self.expected_conf_d, found
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+ def test_v2_dns_no_ips(self):
|
|
||||||
+ entry = NETWORK_CONFIGS["v2-dns-no-if-ips"]
|
|
||||||
+ found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
|
|
||||||
+ self._compare_files_to_expected(
|
|
||||||
+ entry[self.expected_name], self.expected_conf_d, found
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+ def test_v2_dns_no_dhcp(self):
|
|
||||||
+ entry = NETWORK_CONFIGS["v2-dns-no-dhcp"]
|
|
||||||
+ found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
|
|
||||||
+ self._compare_files_to_expected(
|
|
||||||
+ entry[self.expected_name], self.expected_conf_d, found
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
|
|
||||||
@mock.patch(
|
|
||||||
"cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -1,156 +0,0 @@
|
||||||
From cf35040b46abb66c7239d156bd92c7267d7c40f7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: PengpengSun <40026211+PengpengSun@users.noreply.github.com>
|
|
||||||
Date: Fri, 29 Mar 2024 22:39:13 +0800
|
|
||||||
Subject: [PATCH] fix: Fall back to cached local ds if no valid ds found
|
|
||||||
(#4997)
|
|
||||||
|
|
||||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
|
||||||
RH-MergeRequest: 75: fix: Fall back to cached local ds if no valid ds found (#4997)
|
|
||||||
RH-Jira: RHEL-32846
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
RH-Commit: [1/1] 408c41fd8009255d98c31210ef936f2e68dfde75 (anisinha/cloud-init)
|
|
||||||
|
|
||||||
Rebooting an instance which has finished VMware guest
|
|
||||||
customization with DataSourceVMware will load
|
|
||||||
DataSourceNone due to metadata is NOT available.
|
|
||||||
|
|
||||||
This is mostly a re-post of PR#229, few differences are:
|
|
||||||
1. Let ds decide if fallback is allowed, not always fall back
|
|
||||||
to previous cached LOCAL ds.
|
|
||||||
2. No comparing instance-id of cached ds with previous instance-id
|
|
||||||
due to I think they are always identical.
|
|
||||||
|
|
||||||
Fixes GH-3402
|
|
||||||
|
|
||||||
(cherry picked from commit 9929a00580d50afc60bf4e0fb9f2f39d4f797b4b)
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
cloudinit/sources/__init__.py
|
|
||||||
Conflicts because of changes in upstream source coming from
|
|
||||||
30d5e9a3358f4cbaced ("refactor: Use _unpickle rather than hasattr() in sources")
|
|
||||||
---
|
|
||||||
cloudinit/sources/DataSourceVMware.py | 14 +++++++++-
|
|
||||||
cloudinit/sources/__init__.py | 14 ++++++++++
|
|
||||||
cloudinit/stages.py | 40 +++++++++++++++++----------
|
|
||||||
3 files changed, 53 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/sources/DataSourceVMware.py b/cloudinit/sources/DataSourceVMware.py
|
|
||||||
index 1591121d..2d5d42eb 100644
|
|
||||||
--- a/cloudinit/sources/DataSourceVMware.py
|
|
||||||
+++ b/cloudinit/sources/DataSourceVMware.py
|
|
||||||
@@ -197,7 +197,7 @@ class DataSourceVMware(sources.DataSource):
|
|
||||||
break
|
|
||||||
|
|
||||||
if not self.data_access_method:
|
|
||||||
- LOG.error("failed to find a valid data access method")
|
|
||||||
+ LOG.debug("failed to find a valid data access method")
|
|
||||||
return False
|
|
||||||
|
|
||||||
LOG.info("using data access method %s", self._get_subplatform())
|
|
||||||
@@ -291,6 +291,18 @@ class DataSourceVMware(sources.DataSource):
|
|
||||||
self.metadata["instance-id"] = str(id_file.read()).rstrip().lower()
|
|
||||||
return self.metadata["instance-id"]
|
|
||||||
|
|
||||||
+ def check_if_fallback_is_allowed(self):
|
|
||||||
+ if (
|
|
||||||
+ self.data_access_method
|
|
||||||
+ and self.data_access_method == DATA_ACCESS_METHOD_IMC
|
|
||||||
+ and is_vmware_platform()
|
|
||||||
+ ):
|
|
||||||
+ LOG.debug(
|
|
||||||
+ "Cache fallback is allowed for : %s", self._get_subplatform()
|
|
||||||
+ )
|
|
||||||
+ return True
|
|
||||||
+ return False
|
|
||||||
+
|
|
||||||
def get_public_ssh_keys(self):
|
|
||||||
for key_name in (
|
|
||||||
"public-keys-data",
|
|
||||||
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
|
|
||||||
index c207b5ed..453801be 100644
|
|
||||||
--- a/cloudinit/sources/__init__.py
|
|
||||||
+++ b/cloudinit/sources/__init__.py
|
|
||||||
@@ -312,6 +312,10 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
|
|
||||||
self.vendordata2_raw = None
|
|
||||||
if not hasattr(self, "skip_hotplug_detect"):
|
|
||||||
self.skip_hotplug_detect = False
|
|
||||||
+
|
|
||||||
+ if not hasattr(self, "check_if_fallback_is_allowed"):
|
|
||||||
+ setattr(self, "check_if_fallback_is_allowed", lambda: False)
|
|
||||||
+
|
|
||||||
if hasattr(self, "userdata") and self.userdata is not None:
|
|
||||||
# If userdata stores MIME data, on < python3.6 it will be
|
|
||||||
# missing the 'policy' attribute that exists on >=python3.6.
|
|
||||||
@@ -914,6 +918,16 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
|
|
||||||
# quickly (local check only) if self.instance_id is still
|
|
||||||
return False
|
|
||||||
|
|
||||||
+ def check_if_fallback_is_allowed(self):
|
|
||||||
+ """check_if_fallback_is_allowed()
|
|
||||||
+ Checks if a cached ds is allowed to be restored when no valid ds is
|
|
||||||
+ found in local mode by checking instance-id and searching valid data
|
|
||||||
+ through ds list.
|
|
||||||
+
|
|
||||||
+ @return True if a ds allows fallback, False otherwise.
|
|
||||||
+ """
|
|
||||||
+ return False
|
|
||||||
+
|
|
||||||
@staticmethod
|
|
||||||
def _determine_dsmode(candidates, default=None, valid=None):
|
|
||||||
# return the first candidate that is non None, warn if not valid
|
|
||||||
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
|
|
||||||
index 3b6405f5..0b795624 100644
|
|
||||||
--- a/cloudinit/stages.py
|
|
||||||
+++ b/cloudinit/stages.py
|
|
||||||
@@ -353,20 +353,32 @@ class Init:
|
|
||||||
LOG.debug(myrep.description)
|
|
||||||
|
|
||||||
if not ds:
|
|
||||||
- util.del_file(self.paths.instance_link)
|
|
||||||
- (cfg_list, pkg_list) = self._get_datasources()
|
|
||||||
- # Deep copy so that user-data handlers can not modify
|
|
||||||
- # (which will affect user-data handlers down the line...)
|
|
||||||
- (ds, dsname) = sources.find_source(
|
|
||||||
- self.cfg,
|
|
||||||
- self.distro,
|
|
||||||
- self.paths,
|
|
||||||
- copy.deepcopy(self.ds_deps),
|
|
||||||
- cfg_list,
|
|
||||||
- pkg_list,
|
|
||||||
- self.reporter,
|
|
||||||
- )
|
|
||||||
- LOG.info("Loaded datasource %s - %s", dsname, ds)
|
|
||||||
+ try:
|
|
||||||
+ cfg_list, pkg_list = self._get_datasources()
|
|
||||||
+ # Deep copy so that user-data handlers can not modify
|
|
||||||
+ # (which will affect user-data handlers down the line...)
|
|
||||||
+ ds, dsname = sources.find_source(
|
|
||||||
+ self.cfg,
|
|
||||||
+ self.distro,
|
|
||||||
+ self.paths,
|
|
||||||
+ copy.deepcopy(self.ds_deps),
|
|
||||||
+ cfg_list,
|
|
||||||
+ pkg_list,
|
|
||||||
+ self.reporter,
|
|
||||||
+ )
|
|
||||||
+ util.del_file(self.paths.instance_link)
|
|
||||||
+ LOG.info("Loaded datasource %s - %s", dsname, ds)
|
|
||||||
+ except sources.DataSourceNotFoundException as e:
|
|
||||||
+ if existing != "check":
|
|
||||||
+ raise e
|
|
||||||
+ ds = self._restore_from_cache()
|
|
||||||
+ if ds and ds.check_if_fallback_is_allowed():
|
|
||||||
+ LOG.info(
|
|
||||||
+ "Restored fallback datasource from checked cache: %s",
|
|
||||||
+ ds,
|
|
||||||
+ )
|
|
||||||
+ else:
|
|
||||||
+ raise e
|
|
||||||
self.datasource = ds
|
|
||||||
# Ensure we adjust our path members datasource
|
|
||||||
# now that we have one (thus allowing ipath to be used)
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
From 332bb23bcfde801edf792e6c629ec350be07b952 Mon Sep 17 00:00:00 2001
|
|
||||||
From: James Falcon <james.falcon@canonical.com>
|
|
||||||
Date: Tue, 19 Mar 2024 14:24:11 -0500
|
|
||||||
Subject: [PATCH 3/3] fix: Undeprecate 'network' in schema route definition
|
|
||||||
(#5072)
|
|
||||||
|
|
||||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
|
||||||
RH-MergeRequest: 73: fix: Undeprecate 'network' in schema route definition (#5072)
|
|
||||||
RH-Jira: RHEL-29709
|
|
||||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-Commit: [1/1] 61c660be43fd25999bca0cfd66d7b2150fee5a14 (anisinha/cloud-init)
|
|
||||||
|
|
||||||
It is passed through to our v1 schema from OpenStack network_data.json
|
|
||||||
|
|
||||||
Fixes GH-5051
|
|
||||||
|
|
||||||
(cherry picked from commit ff40d1af8a6de3ee27937382ec4ceea931d80a88)
|
|
||||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/config/schemas/schema-network-config-v1.json | 5 +----
|
|
||||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
|
|
||||||
index 56dc27c9..64c492a4 100644
|
|
||||||
--- a/cloudinit/config/schemas/schema-network-config-v1.json
|
|
||||||
+++ b/cloudinit/config/schemas/schema-network-config-v1.json
|
|
||||||
@@ -445,10 +445,7 @@
|
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
"type": "string",
|
|
||||||
- "description": "IPv4 network address with CIDR netmask notation or IPv6 with prefix length. Alias for ``destination`` and only read when ``destination`` key is absent.",
|
|
||||||
- "deprecated": true,
|
|
||||||
- "deprecated_version": "23.3",
|
|
||||||
- "deprecated_description": "Use ``destination`` instead."
|
|
||||||
+ "description": "IPv4 network address with CIDR netmask notation or IPv6 with prefix length. Alias for ``destination`` and only read when ``destination`` key is absent. This exists for OpenStack support. OpenStack route definitions are passed through to v1 config and OpenStack's ``network_data.json`` uses ``network`` instead of ``destination``."
|
|
||||||
},
|
|
||||||
"destination": {
|
|
||||||
"type": "string",
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -1,7 +1,15 @@
|
||||||
From 9e8fbb736d5e8db8bcf0fbc35a76bdad9251990a Mon Sep 17 00:00:00 2001
|
From a622a094a1f497c87a66932382265c2dbf1b88a2 Mon Sep 17 00:00:00 2001
|
||||||
From: d1r3ct0r <calvin.mwadime@canonical.com>
|
From: d1r3ct0r <calvin.mwadime@canonical.com>
|
||||||
Date: Sat, 20 Jan 2024 02:11:47 +0300
|
Date: Sat, 20 Jan 2024 02:11:47 +0300
|
||||||
Subject: [PATCH] fix(clean): stop warning when running clean command (#4761)
|
Subject: [PATCH 1/2] fix(clean): stop warning when running clean command
|
||||||
|
(#4761)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
|
||||||
|
RH-Jira: RHEL-21530
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/2] f7a20c627afabf00db20c80ecd6e7f577053863b
|
||||||
|
|
||||||
When the clean command is run, runparts is called and README in
|
When the clean command is run, runparts is called and README in
|
||||||
/etc/cloud/clean.d is not executable which leads to a warning.
|
/etc/cloud/clean.d is not executable which leads to a warning.
|
||||||
|
@ -14,11 +22,11 @@ Fixes: GH-4760
|
||||||
(cherry picked from commit da08a260965e35fa63def1cd8b8b472f7c354ffe)
|
(cherry picked from commit da08a260965e35fa63def1cd8b8b472f7c354ffe)
|
||||||
|
|
||||||
There is a downstream only change that is squashed with the upstream commit.
|
There is a downstream only change that is squashed with the upstream commit.
|
||||||
The spec file under .distro/ has been updated so as to not include
|
The spec file under `redhat/` has been updated so as to not include
|
||||||
/etc/cloud/clean.d/README file. Otherwise, we shall see errors like the
|
`/etc/cloud/clean.d/README` file. Otherwise, we shall see errors like the
|
||||||
following during the build process:
|
following during the build process:
|
||||||
|
|
||||||
error: File not found: /builddir/build/.../etc/cloud/clean.d/README
|
`error: File not found: /builddir/build/.../etc/cloud/clean.d/README`
|
||||||
|
|
||||||
After a rebase, we can only maintain the downstream spec file change as
|
After a rebase, we can only maintain the downstream spec file change as
|
||||||
the rest of it is clean cherry-pick from upstream.
|
the rest of it is clean cherry-pick from upstream.
|
||||||
|
@ -119,3 +127,6 @@ index 62a9129b..fae3c12b 100644
|
||||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
||||||
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
||||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,9 +1,16 @@
|
||||||
From 54e87eaad7841270e530beff2dcfe68292ae87ef Mon Sep 17 00:00:00 2001
|
From 2942fb776cd1fc765089ebd0004e01dc2b3a5920 Mon Sep 17 00:00:00 2001
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
Date: Tue, 21 Nov 2023 13:57:15 +0530
|
Date: Tue, 21 Nov 2023 13:57:15 +0530
|
||||||
Subject: [PATCH] net: allow dhcp6 configuration from
|
Subject: [PATCH 2/3] net: allow dhcp6 configuration from
|
||||||
generate_fallback_configuration()
|
generate_fallback_configuration()
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
|
||||||
|
RH-Jira: RHEL-7277
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [2/2] b067c813488dfddc79d8ebd5bb51894ff040c356
|
||||||
|
|
||||||
This will make sure on Azure we can use both dhcp4 and dhcp6 when IMDS is not
|
This will make sure on Azure we can use both dhcp4 and dhcp6 when IMDS is not
|
||||||
used. This is useful in situations where only ipv6 network is available and
|
used. This is useful in situations where only ipv6 network is available and
|
||||||
there is no dhcp4 running.
|
there is no dhcp4 running.
|
||||||
|
@ -79,10 +86,10 @@ index 561d5151..60a44186 100644
|
||||||
"set-name": "ens3",
|
"set-name": "ens3",
|
||||||
}
|
}
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
index fb4c863c..d9ef493b 100644
|
index 54d053f3..e52c2497 100644
|
||||||
--- a/tests/unittests/test_net.py
|
--- a/tests/unittests/test_net.py
|
||||||
+++ b/tests/unittests/test_net.py
|
+++ b/tests/unittests/test_net.py
|
||||||
@@ -4339,6 +4339,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
@@ -4299,6 +4299,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
"ethernets": {
|
"ethernets": {
|
||||||
"eth0": {
|
"eth0": {
|
||||||
"dhcp4": True,
|
"dhcp4": True,
|
||||||
|
@ -90,7 +97,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
"set-name": "eth0",
|
"set-name": "eth0",
|
||||||
"match": {
|
"match": {
|
||||||
"macaddress": "00:11:22:33:44:55",
|
"macaddress": "00:11:22:33:44:55",
|
||||||
@@ -4423,6 +4424,9 @@ iface lo inet loopback
|
@@ -4383,6 +4384,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
auto eth0
|
auto eth0
|
||||||
iface eth0 inet dhcp
|
iface eth0 inet dhcp
|
||||||
|
@ -100,7 +107,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
"""
|
"""
|
||||||
self.assertEqual(expected.lstrip(), contents.lstrip())
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
@@ -4512,6 +4516,9 @@ iface lo inet loopback
|
@@ -4472,6 +4476,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
auto eth1
|
auto eth1
|
||||||
iface eth1 inet dhcp
|
iface eth1 inet dhcp
|
||||||
|
@ -110,8 +117,8 @@ index fb4c863c..d9ef493b 100644
|
||||||
"""
|
"""
|
||||||
self.assertEqual(expected.lstrip(), contents.lstrip())
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
@@ -4736,7 +4743,9 @@ class TestRhelSysConfigRendering(CiTestCase):
|
@@ -4695,7 +4702,9 @@ class TestRhelSysConfigRendering(CiTestCase):
|
||||||
AUTOCONNECT_PRIORITY=120
|
#
|
||||||
BOOTPROTO=dhcp
|
BOOTPROTO=dhcp
|
||||||
DEVICE=eth1000
|
DEVICE=eth1000
|
||||||
+DHCPV6C=yes
|
+DHCPV6C=yes
|
||||||
|
@ -120,7 +127,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
ONBOOT=yes
|
ONBOOT=yes
|
||||||
TYPE=Ethernet
|
TYPE=Ethernet
|
||||||
USERCTL=no
|
USERCTL=no
|
||||||
@@ -5646,7 +5655,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
|
@@ -5593,7 +5602,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
|
||||||
expected_content = """
|
expected_content = """
|
||||||
# Created by cloud-init automatically, do not edit.
|
# Created by cloud-init automatically, do not edit.
|
||||||
#
|
#
|
||||||
|
@ -130,7 +137,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
LLADDR=07-1c-c6-75-a4-be
|
LLADDR=07-1c-c6-75-a4-be
|
||||||
STARTMODE=auto
|
STARTMODE=auto
|
||||||
""".lstrip()
|
""".lstrip()
|
||||||
@@ -6032,7 +6042,11 @@ class TestNetworkManagerRendering(CiTestCase):
|
@@ -5979,7 +5989,11 @@ class TestNetworkManagerRendering(CiTestCase):
|
||||||
|
|
||||||
[ipv4]
|
[ipv4]
|
||||||
method=auto
|
method=auto
|
||||||
|
@ -143,7 +150,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
|
|
||||||
"""
|
"""
|
||||||
),
|
),
|
||||||
@@ -6298,6 +6312,9 @@ iface lo inet loopback
|
@@ -6245,6 +6259,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
auto eth1000
|
auto eth1000
|
||||||
iface eth1000 inet dhcp
|
iface eth1000 inet dhcp
|
||||||
|
@ -153,7 +160,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
"""
|
"""
|
||||||
self.assertEqual(expected.lstrip(), contents.lstrip())
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
@@ -6357,6 +6374,7 @@ class TestNetplanNetRendering:
|
@@ -6304,6 +6321,7 @@ class TestNetplanNetRendering:
|
||||||
ethernets:
|
ethernets:
|
||||||
eth1000:
|
eth1000:
|
||||||
dhcp4: true
|
dhcp4: true
|
||||||
|
@ -161,7 +168,7 @@ index fb4c863c..d9ef493b 100644
|
||||||
match:
|
match:
|
||||||
macaddress: 07-1c-c6-75-a4-be
|
macaddress: 07-1c-c6-75-a4-be
|
||||||
set-name: eth1000
|
set-name: eth1000
|
||||||
@@ -7856,7 +7874,7 @@ class TestNetworkdNetRendering(CiTestCase):
|
@@ -7803,7 +7821,7 @@ class TestNetworkdNetRendering(CiTestCase):
|
||||||
Name=eth1000
|
Name=eth1000
|
||||||
MACAddress=07-1c-c6-75-a4-be
|
MACAddress=07-1c-c6-75-a4-be
|
||||||
[Network]
|
[Network]
|
||||||
|
@ -170,3 +177,6 @@ index fb4c863c..d9ef493b 100644
|
||||||
).rstrip(" ")
|
).rstrip(" ")
|
||||||
|
|
||||||
expected = self.create_conf_dict(expected.splitlines())
|
expected = self.create_conf_dict(expected.splitlines())
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,8 +1,15 @@
|
||||||
From 5fa8113a9efaa90f293b95477c4fa44e3d4b6537 Mon Sep 17 00:00:00 2001
|
From 010cd58942c82e902bc02cb5a34074f6083fc890 Mon Sep 17 00:00:00 2001
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
Date: Thu, 23 Nov 2023 12:27:51 +0530
|
Date: Thu, 23 Nov 2023 12:27:51 +0530
|
||||||
Subject: [PATCH] net/network_manager: do not set "may-fail" to False for both
|
Subject: [PATCH 1/3] net/network_manager: do not set "may-fail" to False for
|
||||||
ipv4 and ipv6 dhcp
|
both ipv4 and ipv6 dhcp
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
|
||||||
|
RH-Jira: RHEL-7277
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [1/2] be07418f69a4c461e2fa02a72b7b985053af9660
|
||||||
|
|
||||||
If "may-fail" is set to False in the Network Manager keyfile for both ipv4
|
If "may-fail" is set to False in the Network Manager keyfile for both ipv4
|
||||||
and ipv6 for dhcp configuration, it essentially means both ipv4 and ipv6 network
|
and ipv6 for dhcp configuration, it essentially means both ipv4 and ipv6 network
|
||||||
|
@ -107,10 +114,10 @@ index 8374cfcc..8a99eb3a 100644
|
||||||
ipv4_mtu = device_mtu
|
ipv4_mtu = device_mtu
|
||||||
if not ipv4_mtu == device_mtu:
|
if not ipv4_mtu == device_mtu:
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
index cef4fa2d..fb4c863c 100644
|
index 052b0674..54d053f3 100644
|
||||||
--- a/tests/unittests/test_net.py
|
--- a/tests/unittests/test_net.py
|
||||||
+++ b/tests/unittests/test_net.py
|
+++ b/tests/unittests/test_net.py
|
||||||
@@ -1477,11 +1477,11 @@ NETWORK_CONFIGS = {
|
@@ -1470,11 +1470,11 @@ NETWORK_CONFIGS = {
|
||||||
|
|
||||||
[ipv4]
|
[ipv4]
|
||||||
method=auto
|
method=auto
|
||||||
|
@ -124,7 +131,7 @@ index cef4fa2d..fb4c863c 100644
|
||||||
|
|
||||||
"""
|
"""
|
||||||
),
|
),
|
||||||
@@ -1650,11 +1650,11 @@ NETWORK_CONFIGS = {
|
@@ -1642,11 +1642,11 @@ NETWORK_CONFIGS = {
|
||||||
|
|
||||||
[ipv6]
|
[ipv6]
|
||||||
method=auto
|
method=auto
|
||||||
|
@ -138,3 +145,6 @@ index cef4fa2d..fb4c863c 100644
|
||||||
|
|
||||||
"""
|
"""
|
||||||
),
|
),
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,8 +1,15 @@
|
||||||
From c0df864e373e1e34bf23c4869acdf7d20aea7aaf Mon Sep 17 00:00:00 2001
|
From ffc8f3fbb4c8c14a4ef2b6a99a9ea61da4bedde7 Mon Sep 17 00:00:00 2001
|
||||||
From: Ani Sinha <anisinha@redhat.com>
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
Date: Thu, 7 Dec 2023 02:39:51 +0530
|
Date: Thu, 7 Dec 2023 02:39:51 +0530
|
||||||
Subject: [PATCH] net/nm: check for presence of ifcfg files when nm connection
|
Subject: [PATCH 3/3] net/nm: check for presence of ifcfg files when nm
|
||||||
files are absent (#4645)
|
connection files are absent (#4645)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 120: net/nm: check for presence of ifcfg files when nm connection files are absent (#4645)
|
||||||
|
RH-Jira: RHEL-17610
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Commit: [1/1] e0647418de8b70724a32500f26f544650d701404
|
||||||
|
|
||||||
On systems that use network manager to manage connections and activate network
|
On systems that use network manager to manage connections and activate network
|
||||||
interfaces, they may also use ifcfg files for configuring
|
interfaces, they may also use ifcfg files for configuring
|
||||||
|
@ -111,3 +118,6 @@ index 8a99eb3a..76a0ac15 100644
|
||||||
def cloud_init_nm_conf_filename(target=None):
|
def cloud_init_nm_conf_filename(target=None):
|
||||||
target_con_dir = subp.target_path(target, NM_RUN_DIR)
|
target_con_dir = subp.target_path(target, NM_RUN_DIR)
|
||||||
conf_file = "30-cloud-init-ip6-addr-gen-mode.conf"
|
conf_file = "30-cloud-init-ip6-addr-gen-mode.conf"
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
From e5258b60a3dbf44ef1faac91db2b45dab09de0b5 Mon Sep 17 00:00:00 2001
|
From c43791eeb00bc9000abff0125c18aa6a7e8b7160 Mon Sep 17 00:00:00 2001
|
||||||
From: Brett Holman <brett.holman@canonical.com>
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
Date: Tue, 16 Jan 2024 12:43:17 -0700
|
Date: Tue, 16 Jan 2024 12:43:17 -0700
|
||||||
Subject: [PATCH] test(jsonschema): Pin jsonschema version (#4781)
|
Subject: [PATCH 2/2] test(jsonschema): Pin jsonschema version (#4781)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
|
||||||
|
RH-Jira: RHEL-21530
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [2/2] f864085d47723b3fb462c3b6fc6e24b90bf040aa
|
||||||
|
|
||||||
Release 4.21.0 broke tests
|
Release 4.21.0 broke tests
|
||||||
|
|
||||||
|
@ -36,3 +43,6 @@ index 19488b94..46a98b4c 100644
|
||||||
+jsonschema<=4.20.0
|
+jsonschema<=4.20.0
|
||||||
responses
|
responses
|
||||||
passlib
|
passlib
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue