* Tue Nov 05 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-19
- ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch [RHEL-65016] - ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch [RHEL-65019] - ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch [RHEL-65019] - Resolves: RHEL-65016 (Configuring metric for default gateway is not working [rhel-10]) - Resolves: RHEL-65019 (NoCloud - network_config bridges incorrectly configured [rhel-10])
This commit is contained in:
Miroslav Rezanina
parent
238bb856ad
commit
59b57283a0
146
ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch
Normal file
146
ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
From 2da948152c4b7b2f30dc6189d0072f7562df1ad5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Fri, 4 Oct 2024 02:38:23 +0530
|
||||||
|
Subject: [PATCH 1/3] Fix metric setting for ifcfg network connections for rhel
|
||||||
|
(#5777)
|
||||||
|
|
||||||
|
RH-Author: xiachen <xiachen@redhat.com>
|
||||||
|
RH-MergeRequest: 112: Fix metric setting for ifcfg network connections for rhel (#5777)
|
||||||
|
RH-Jira: RHEL-65016
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
RH-Commit: [1/1] ee573dfb2dccc59f2c9b74ca3f95026f96c49998 (xiachen/cloud-init-centos)
|
||||||
|
|
||||||
|
Most RHEL systems use Network manager to bring up manage network connections.
|
||||||
|
Network manager does not recognize "METRIC" option for network connections.
|
||||||
|
It uses IPV4_ROUTE_METRIC and IPV6_ROUTE_METRIC options. Please see
|
||||||
|
https://people.freedesktop.org/~lkundrak/nm-docs/nm-settings-ifcfg-rh.html
|
||||||
|
|
||||||
|
This change ensures that cloud-init generates ifcfg network connection files
|
||||||
|
with IPV{4/6}_ROUTE_METRIC options that are compatible with RHEL and
|
||||||
|
network manager.
|
||||||
|
|
||||||
|
Fixes GH-5776
|
||||||
|
|
||||||
|
(cherry picked from commit a399f4b0815234e3fe11255178c737902b2d243d)
|
||||||
|
|
||||||
|
Signed-off-by: Amy Chen <xiachen@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/net/sysconfig.py | 21 ++++++++++++++++++---
|
||||||
|
tests/unittests/test_net.py | 37 ++++++++++++++++++++-----------------
|
||||||
|
2 files changed, 38 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
|
index 32ee7901..503b6993 100644
|
||||||
|
--- a/cloudinit/net/sysconfig.py
|
||||||
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
|
@@ -205,7 +205,7 @@ class Route(ConfigMap):
|
||||||
|
)
|
||||||
|
metric_key = "METRIC" + index
|
||||||
|
if metric_key in self._conf:
|
||||||
|
- metric_value = str(self._conf["METRIC" + index])
|
||||||
|
+ metric_value = str(self._conf[metric_key])
|
||||||
|
buf.write(
|
||||||
|
"%s=%s\n"
|
||||||
|
% ("METRIC" + str(reindex), _quote_value(metric_value))
|
||||||
|
@@ -549,7 +549,12 @@ class Renderer(renderer.Renderer):
|
||||||
|
subnet_type = subnet.get("type")
|
||||||
|
# metric may apply to both dhcp and static config
|
||||||
|
if "metric" in subnet:
|
||||||
|
- if flavor != "suse":
|
||||||
|
+ if flavor == "rhel":
|
||||||
|
+ if subnet_is_ipv6(subnet):
|
||||||
|
+ iface_cfg["IPV6_ROUTE_METRIC"] = subnet["metric"]
|
||||||
|
+ else:
|
||||||
|
+ iface_cfg["IPV4_ROUTE_METRIC"] = subnet["metric"]
|
||||||
|
+ elif flavor != "suse":
|
||||||
|
iface_cfg["METRIC"] = subnet["metric"]
|
||||||
|
if subnet_type in ["dhcp", "dhcp4"]:
|
||||||
|
# On SUSE distros 'DHCLIENT_SET_DEFAULT_ROUTE' is a global
|
||||||
|
@@ -656,7 +661,17 @@ class Renderer(renderer.Renderer):
|
||||||
|
iface_cfg["GATEWAY"] = route["gateway"]
|
||||||
|
route_cfg.has_set_default_ipv4 = True
|
||||||
|
if "metric" in route:
|
||||||
|
- iface_cfg["METRIC"] = route["metric"]
|
||||||
|
+ if flavor == "rhel":
|
||||||
|
+ if subnet_is_ipv6(subnet):
|
||||||
|
+ iface_cfg["IPV6_ROUTE_METRIC"] = route[
|
||||||
|
+ "metric"
|
||||||
|
+ ]
|
||||||
|
+ else:
|
||||||
|
+ iface_cfg["IPV4_ROUTE_METRIC"] = route[
|
||||||
|
+ "metric"
|
||||||
|
+ ]
|
||||||
|
+ else:
|
||||||
|
+ iface_cfg["METRIC"] = route["metric"]
|
||||||
|
|
||||||
|
else:
|
||||||
|
# add default routes only to ifcfg files, not
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index de149f5e..00198232 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -1345,7 +1345,7 @@ NETWORK_CONFIGS = {
|
||||||
|
HWADDR=c0:d6:9f:2c:e8:80
|
||||||
|
IPADDR=192.168.21.3
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- METRIC=10000
|
||||||
|
+ IPV4_ROUTE_METRIC=10000
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -1519,7 +1519,7 @@ NETWORK_CONFIGS = {
|
||||||
|
HWADDR=c0:d6:9f:2c:e8:80
|
||||||
|
IPADDR=192.168.21.3
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- METRIC=10000
|
||||||
|
+ IPV4_ROUTE_METRIC=10000
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -6072,24 +6072,27 @@ USERCTL=no
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
- expected = {
|
||||||
|
- "ifcfg-eno1": textwrap.dedent(
|
||||||
|
- """\
|
||||||
|
- AUTOCONNECT_PRIORITY=120
|
||||||
|
- BOOTPROTO=dhcp
|
||||||
|
- DEVICE=eno1
|
||||||
|
- HWADDR=07-1c-c6-75-a4-be
|
||||||
|
- METRIC=100
|
||||||
|
- ONBOOT=yes
|
||||||
|
- TYPE=Ethernet
|
||||||
|
- USERCTL=no
|
||||||
|
- """
|
||||||
|
- ),
|
||||||
|
- }
|
||||||
|
for dhcp_ver in ("dhcp4", "dhcp6"):
|
||||||
|
+ expected = {
|
||||||
|
+ "ifcfg-eno1": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ AUTOCONNECT_PRIORITY=120
|
||||||
|
+ BOOTPROTO=dhcp
|
||||||
|
+ DEVICE=eno1
|
||||||
|
+ HWADDR=07-1c-c6-75-a4-be
|
||||||
|
+ ONBOOT=yes
|
||||||
|
+ TYPE=Ethernet
|
||||||
|
+ USERCTL=no
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ }
|
||||||
|
v2data = copy.deepcopy(v2base)
|
||||||
|
if dhcp_ver == "dhcp6":
|
||||||
|
- expected["ifcfg-eno1"] += "IPV6INIT=yes\nDHCPV6C=yes\n"
|
||||||
|
+ expected[
|
||||||
|
+ "ifcfg-eno1"
|
||||||
|
+ ] += "IPV6INIT=yes\nDHCPV6C=yes\nIPV6_ROUTE_METRIC=100\n"
|
||||||
|
+ else:
|
||||||
|
+ expected["ifcfg-eno1"] += "IPV4_ROUTE_METRIC=100\n"
|
||||||
|
v2data["ethernets"]["eno1"].update(
|
||||||
|
{dhcp_ver: True, "{0}-overrides".format(dhcp_ver): overrides}
|
||||||
|
)
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
304
ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch
Normal file
304
ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch
Normal file
@ -0,0 +1,304 @@
|
|||||||
|
From 60eca5a45a35982f42db58dd0d6d53bd2587e477 Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Falcon <james.falcon@canonical.com>
|
||||||
|
Date: Thu, 10 Oct 2024 23:19:28 -0500
|
||||||
|
Subject: [PATCH 2/3] fix: Render bridges correctly for v2 on sysconfig with
|
||||||
|
set-name (#5674)
|
||||||
|
|
||||||
|
RH-Author: xiachen <xiachen@redhat.com>
|
||||||
|
RH-MergeRequest: 114: fix: Render bridges correctly for v2 on sysconfig with set-name (#5674)
|
||||||
|
RH-Jira: RHEL-65019
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
RH-Commit: [1/2] 4171be9d48c4c4f7b8aa8d231cea8591daec9c93 (xiachen/cloud-init-centos)
|
||||||
|
|
||||||
|
When listing interfaces in v2 format, we should expect to be able to
|
||||||
|
reference other interfaces using the name in the configuration, not
|
||||||
|
the name the interface will eventually take. This was broken when
|
||||||
|
using `set-name`.
|
||||||
|
|
||||||
|
To fix this, we now store the configuration id alongside the eventual
|
||||||
|
name, and reference that instead of the name.
|
||||||
|
|
||||||
|
Fixes GH-5574
|
||||||
|
|
||||||
|
(cherry picked from commit a8f69409e5cebf43767d3bb54fbad7ced1e8fc7b)
|
||||||
|
Signed-off-by: Amy Chen <xiachen@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/net/eni.py | 6 +++
|
||||||
|
cloudinit/net/network_state.py | 29 ++++------
|
||||||
|
cloudinit/net/sysconfig.py | 24 ++++++---
|
||||||
|
tests/unittests/test_net.py | 96 ++++++++++++++++++++++++++++++++++
|
||||||
|
4 files changed, 128 insertions(+), 27 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
|
||||||
|
index 59dc395f..fa0b47af 100644
|
||||||
|
--- a/cloudinit/net/eni.py
|
||||||
|
+++ b/cloudinit/net/eni.py
|
||||||
|
@@ -5,6 +5,7 @@ import glob
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
+from contextlib import suppress
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from cloudinit import subp, util
|
||||||
|
@@ -421,6 +422,11 @@ class Renderer(renderer.Renderer):
|
||||||
|
return content
|
||||||
|
|
||||||
|
def _render_iface(self, iface, render_hwaddress=False):
|
||||||
|
+ iface = copy.deepcopy(iface)
|
||||||
|
+
|
||||||
|
+ # Remove irrelevant keys
|
||||||
|
+ with suppress(KeyError):
|
||||||
|
+ iface.pop("config_id")
|
||||||
|
sections = []
|
||||||
|
subnets = iface.get("subnets", {})
|
||||||
|
accept_ra = iface.pop("accept-ra", None)
|
||||||
|
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
|
||||||
|
index 9f34467b..fb08491f 100644
|
||||||
|
--- a/cloudinit/net/network_state.py
|
||||||
|
+++ b/cloudinit/net/network_state.py
|
||||||
|
@@ -411,6 +411,7 @@ class NetworkStateInterpreter:
|
||||||
|
wakeonlan = util.is_true(wakeonlan)
|
||||||
|
iface.update(
|
||||||
|
{
|
||||||
|
+ "config_id": command.get("config_id"),
|
||||||
|
"name": command.get("name"),
|
||||||
|
"type": command.get("type"),
|
||||||
|
"mac_address": command.get("mac_address"),
|
||||||
|
@@ -424,7 +425,8 @@ class NetworkStateInterpreter:
|
||||||
|
"wakeonlan": wakeonlan,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
- self._network_state["interfaces"].update({command.get("name"): iface})
|
||||||
|
+ iface_key = command.get("config_id", command.get("name"))
|
||||||
|
+ self._network_state["interfaces"].update({iface_key: iface})
|
||||||
|
self.dump_network_state()
|
||||||
|
|
||||||
|
@ensure_command_keys(["name", "vlan_id", "vlan_link"])
|
||||||
|
@@ -712,6 +714,7 @@ class NetworkStateInterpreter:
|
||||||
|
|
||||||
|
for eth, cfg in command.items():
|
||||||
|
phy_cmd = {
|
||||||
|
+ "config_id": eth,
|
||||||
|
"type": "physical",
|
||||||
|
}
|
||||||
|
match = cfg.get("match", {})
|
||||||
|
@@ -800,26 +803,14 @@ class NetworkStateInterpreter:
|
||||||
|
def _v2_common(self, cfg) -> None:
|
||||||
|
LOG.debug("v2_common: handling config:\n%s", cfg)
|
||||||
|
for iface, dev_cfg in cfg.items():
|
||||||
|
- if "set-name" in dev_cfg:
|
||||||
|
- set_name_iface = dev_cfg.get("set-name")
|
||||||
|
- if set_name_iface:
|
||||||
|
- iface = set_name_iface
|
||||||
|
if "nameservers" in dev_cfg:
|
||||||
|
- search = dev_cfg.get("nameservers").get("search", [])
|
||||||
|
- dns = dev_cfg.get("nameservers").get("addresses", [])
|
||||||
|
+ search = dev_cfg.get("nameservers").get("search")
|
||||||
|
+ dns = dev_cfg.get("nameservers").get("addresses")
|
||||||
|
name_cmd = {"type": "nameserver"}
|
||||||
|
- if len(search) > 0:
|
||||||
|
- name_cmd.update({"search": search})
|
||||||
|
- if len(dns) > 0:
|
||||||
|
- name_cmd.update({"address": dns})
|
||||||
|
-
|
||||||
|
- mac_address: Optional[str] = dev_cfg.get("match", {}).get(
|
||||||
|
- "macaddress"
|
||||||
|
- )
|
||||||
|
- if mac_address:
|
||||||
|
- real_if_name = find_interface_name_from_mac(mac_address)
|
||||||
|
- if real_if_name:
|
||||||
|
- iface = real_if_name
|
||||||
|
+ if search:
|
||||||
|
+ name_cmd["search"] = search
|
||||||
|
+ if dns:
|
||||||
|
+ name_cmd["address"] = dns
|
||||||
|
|
||||||
|
self._handle_individual_nameserver(name_cmd, iface)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
|
index 503b6993..96652e15 100644
|
||||||
|
--- a/cloudinit/net/sysconfig.py
|
||||||
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
|
@@ -6,7 +6,7 @@ import io
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
-from typing import Mapping, Optional
|
||||||
|
+from typing import Dict, Optional
|
||||||
|
|
||||||
|
from cloudinit import subp, util
|
||||||
|
from cloudinit.distros.parsers import networkmanager_conf, resolv_conf
|
||||||
|
@@ -721,7 +721,7 @@ class Renderer(renderer.Renderer):
|
||||||
|
):
|
||||||
|
physical_filter = renderer.filter_by_physical
|
||||||
|
for iface in network_state.iter_interfaces(physical_filter):
|
||||||
|
- iface_name = iface["name"]
|
||||||
|
+ iface_name = iface.get("config_id") or iface["name"]
|
||||||
|
iface_subnets = iface.get("subnets", [])
|
||||||
|
iface_cfg = iface_contents[iface_name]
|
||||||
|
route_cfg = iface_cfg.routes
|
||||||
|
@@ -926,7 +926,9 @@ class Renderer(renderer.Renderer):
|
||||||
|
return out
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
- def _render_bridge_interfaces(cls, network_state, iface_contents, flavor):
|
||||||
|
+ def _render_bridge_interfaces(
|
||||||
|
+ cls, network_state: NetworkState, iface_contents, flavor
|
||||||
|
+ ):
|
||||||
|
bridge_key_map = {
|
||||||
|
old_k: new_k
|
||||||
|
for old_k, new_k in cls.cfg_key_maps[flavor].items()
|
||||||
|
@@ -1007,23 +1009,29 @@ class Renderer(renderer.Renderer):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _render_sysconfig(
|
||||||
|
- cls, base_sysconf_dir, network_state, flavor, templates=None
|
||||||
|
+ cls,
|
||||||
|
+ base_sysconf_dir,
|
||||||
|
+ network_state: NetworkState,
|
||||||
|
+ flavor,
|
||||||
|
+ templates=None,
|
||||||
|
):
|
||||||
|
"""Given state, return /etc/sysconfig files + contents"""
|
||||||
|
if not templates:
|
||||||
|
templates = cls.templates
|
||||||
|
- iface_contents: Mapping[str, NetInterface] = {}
|
||||||
|
+ iface_contents: Dict[str, NetInterface] = {}
|
||||||
|
for iface in network_state.iter_interfaces():
|
||||||
|
if iface["type"] == "loopback":
|
||||||
|
continue
|
||||||
|
- iface_name = iface["name"]
|
||||||
|
- iface_cfg = NetInterface(iface_name, base_sysconf_dir, templates)
|
||||||
|
+ config_id: str = iface.get("config_id") or iface["name"]
|
||||||
|
+ iface_cfg = NetInterface(
|
||||||
|
+ iface["name"], base_sysconf_dir, templates
|
||||||
|
+ )
|
||||||
|
if flavor == "suse":
|
||||||
|
iface_cfg.drop("DEVICE")
|
||||||
|
# If type detection fails it is considered a bug in SUSE
|
||||||
|
iface_cfg.drop("TYPE")
|
||||||
|
cls._render_iface_shared(iface, iface_cfg, flavor)
|
||||||
|
- iface_contents[iface_name] = iface_cfg
|
||||||
|
+ iface_contents[config_id] = iface_cfg
|
||||||
|
cls._render_physical_interfaces(network_state, iface_contents, flavor)
|
||||||
|
cls._render_bond_interfaces(network_state, iface_contents, flavor)
|
||||||
|
cls._render_vlan_interfaces(network_state, iface_contents, flavor)
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index 00198232..41e6fa56 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -4822,6 +4822,95 @@ iface bond0 inet6 static
|
||||||
|
"""
|
||||||
|
),
|
||||||
|
},
|
||||||
|
+ "v2-bridges-set-name": {
|
||||||
|
+ "yaml": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ version: 2
|
||||||
|
+ ethernets:
|
||||||
|
+ baremetalport:
|
||||||
|
+ match:
|
||||||
|
+ macaddress: 52:54:00:bd:8f:cb
|
||||||
|
+ set-name: baremetal0
|
||||||
|
+ provisioningport:
|
||||||
|
+ match:
|
||||||
|
+ macaddress: 52:54:00:25:ae:12
|
||||||
|
+ set-name: provisioning0
|
||||||
|
+ bridges:
|
||||||
|
+ baremetal:
|
||||||
|
+ addresses:
|
||||||
|
+ - fc00:1:1::2/64
|
||||||
|
+ interfaces:
|
||||||
|
+ - baremetalport
|
||||||
|
+ provisioning:
|
||||||
|
+ addresses:
|
||||||
|
+ - fc00:1:2::2/64
|
||||||
|
+ interfaces:
|
||||||
|
+ - provisioningport
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "expected_sysconfig_rhel": {
|
||||||
|
+ "ifcfg-baremetal": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Created by cloud-init automatically, do not edit.
|
||||||
|
+ #
|
||||||
|
+ AUTOCONNECT_PRIORITY=120
|
||||||
|
+ BOOTPROTO=none
|
||||||
|
+ DEVICE=baremetal
|
||||||
|
+ IPV6ADDR=fc00:1:1::2/64
|
||||||
|
+ IPV6INIT=yes
|
||||||
|
+ IPV6_AUTOCONF=no
|
||||||
|
+ IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
+ ONBOOT=yes
|
||||||
|
+ TYPE=Bridge
|
||||||
|
+ USERCTL=no
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "ifcfg-baremetal0": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Created by cloud-init automatically, do not edit.
|
||||||
|
+ #
|
||||||
|
+ AUTOCONNECT_PRIORITY=120
|
||||||
|
+ BOOTPROTO=none
|
||||||
|
+ BRIDGE=baremetal
|
||||||
|
+ DEVICE=baremetal0
|
||||||
|
+ HWADDR=52:54:00:bd:8f:cb
|
||||||
|
+ ONBOOT=yes
|
||||||
|
+ TYPE=Ethernet
|
||||||
|
+ USERCTL=no
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "ifcfg-provisioning": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Created by cloud-init automatically, do not edit.
|
||||||
|
+ #
|
||||||
|
+ AUTOCONNECT_PRIORITY=120
|
||||||
|
+ BOOTPROTO=none
|
||||||
|
+ DEVICE=provisioning
|
||||||
|
+ IPV6ADDR=fc00:1:2::2/64
|
||||||
|
+ IPV6INIT=yes
|
||||||
|
+ IPV6_AUTOCONF=no
|
||||||
|
+ IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
+ ONBOOT=yes
|
||||||
|
+ TYPE=Bridge
|
||||||
|
+ USERCTL=no
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "ifcfg-provisioning0": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Created by cloud-init automatically, do not edit.
|
||||||
|
+ #
|
||||||
|
+ AUTOCONNECT_PRIORITY=120
|
||||||
|
+ BOOTPROTO=none
|
||||||
|
+ BRIDGE=provisioning
|
||||||
|
+ DEVICE=provisioning0
|
||||||
|
+ HWADDR=52:54:00:25:ae:12
|
||||||
|
+ ONBOOT=yes
|
||||||
|
+ TYPE=Ethernet
|
||||||
|
+ USERCTL=no
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -5891,6 +5980,13 @@ USERCTL=no
|
||||||
|
self._compare_files_to_expected(entry[self.expected_name], found)
|
||||||
|
self._assert_headers(found)
|
||||||
|
|
||||||
|
+ def test_bridges_set_name_config(self):
|
||||||
|
+ entry = NETWORK_CONFIGS["v2-bridges-set-name"]
|
||||||
|
+ found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
|
||||||
|
+ self._compare_files_to_expected(
|
||||||
|
+ entry[self.expected_name], found)
|
||||||
|
+ self._assert_headers(found)
|
||||||
|
+
|
||||||
|
def test_netplan_dhcp_false_disable_dhcp_in_state(self):
|
||||||
|
"""netplan config with dhcp[46]: False should not add dhcp in state"""
|
||||||
|
net_config = yaml.load(NETPLAN_DHCP_FALSE)
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
160
ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch
Normal file
160
ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
From 59079c817ead856135ce40698f4d350a425cd65e Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Falcon <james.falcon@canonical.com>
|
||||||
|
Date: Fri, 11 Oct 2024 13:58:19 -0500
|
||||||
|
Subject: [PATCH 3/3] fix: Render v2 bridges correctly on network-manager with
|
||||||
|
set-name (#5740)
|
||||||
|
|
||||||
|
RH-Author: xiachen <xiachen@redhat.com>
|
||||||
|
RH-MergeRequest: 114: fix: Render bridges correctly for v2 on sysconfig with set-name (#5674)
|
||||||
|
RH-Jira: RHEL-65019
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
RH-Commit: [2/2] a33642f97a8e5cb3816f17ce726187aa33825362 (xiachen/cloud-init-centos)
|
||||||
|
|
||||||
|
Similar to the recent sysconfig fix, ensure bridges render correctly
|
||||||
|
for configs that contain `set-name`.
|
||||||
|
|
||||||
|
Fixes GH-5717
|
||||||
|
|
||||||
|
(cherry picked from commit 9554338e6ecf49c66324cc637eaf0fa7bf10e407)
|
||||||
|
Signed-off-by: Amy Chen <xiachen@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/net/network_manager.py | 6 +-
|
||||||
|
tests/unittests/test_net.py | 94 ++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 98 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
||||||
|
index a13d4c14..67614399 100644
|
||||||
|
--- a/cloudinit/net/network_manager.py
|
||||||
|
+++ b/cloudinit/net/network_manager.py
|
||||||
|
@@ -496,11 +496,13 @@ class Renderer(renderer.Renderer):
|
||||||
|
# interfaces that have UUIDs that can be linked to from related
|
||||||
|
# interfaces
|
||||||
|
for iface in network_state.iter_interfaces():
|
||||||
|
- self.connections[iface["name"]] = NMConnection(iface["name"])
|
||||||
|
+ conn_key = iface.get("config_id") or iface["name"]
|
||||||
|
+ self.connections[conn_key] = NMConnection(iface["name"])
|
||||||
|
|
||||||
|
# Now render the actual interface configuration
|
||||||
|
for iface in network_state.iter_interfaces():
|
||||||
|
- conn = self.connections[iface["name"]]
|
||||||
|
+ conn_key = iface.get("config_id") or iface["name"]
|
||||||
|
+ conn = self.connections[conn_key]
|
||||||
|
conn.render_interface(iface, network_state, self)
|
||||||
|
|
||||||
|
# And finally write the files
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index 41e6fa56..8a75c42b 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -4910,6 +4910,94 @@ iface bond0 inet6 static
|
||||||
|
"""
|
||||||
|
),
|
||||||
|
},
|
||||||
|
+ "expected_network_manager": {
|
||||||
|
+ "cloud-init-baremetal.nmconnection": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Generated by cloud-init. Changes will be lost.
|
||||||
|
+
|
||||||
|
+ [connection]
|
||||||
|
+ id=cloud-init baremetal
|
||||||
|
+ uuid=e63eed9a-cd1c-55de-8d5e-1e80b756a482
|
||||||
|
+ autoconnect-priority=120
|
||||||
|
+ type=bridge
|
||||||
|
+ interface-name=baremetal
|
||||||
|
+
|
||||||
|
+ [user]
|
||||||
|
+ org.freedesktop.NetworkManager.origin=cloud-init
|
||||||
|
+
|
||||||
|
+ [bridge]
|
||||||
|
+
|
||||||
|
+ [ipv6]
|
||||||
|
+ method=manual
|
||||||
|
+ may-fail=false
|
||||||
|
+ address1=fc00:1:1::2/64
|
||||||
|
+
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "cloud-init-baremetalport.nmconnection": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Generated by cloud-init. Changes will be lost.
|
||||||
|
+
|
||||||
|
+ [connection]
|
||||||
|
+ id=cloud-init baremetal0
|
||||||
|
+ uuid=8e326690-51d6-5157-ab84-e4e822b06503
|
||||||
|
+ autoconnect-priority=120
|
||||||
|
+ type=ethernet
|
||||||
|
+ slave-type=bridge
|
||||||
|
+ master=e63eed9a-cd1c-55de-8d5e-1e80b756a482
|
||||||
|
+
|
||||||
|
+ [user]
|
||||||
|
+ org.freedesktop.NetworkManager.origin=cloud-init
|
||||||
|
+
|
||||||
|
+ [ethernet]
|
||||||
|
+ mac-address=52:54:00:BD:8F:CB
|
||||||
|
+
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "cloud-init-provisioning.nmconnection": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Generated by cloud-init. Changes will be lost.
|
||||||
|
+
|
||||||
|
+ [connection]
|
||||||
|
+ id=cloud-init provisioning
|
||||||
|
+ uuid=e5bd3f1a-cdcc-55d3-a6d8-88f1ba73bd0e
|
||||||
|
+ autoconnect-priority=120
|
||||||
|
+ type=bridge
|
||||||
|
+ interface-name=provisioning
|
||||||
|
+
|
||||||
|
+ [user]
|
||||||
|
+ org.freedesktop.NetworkManager.origin=cloud-init
|
||||||
|
+
|
||||||
|
+ [bridge]
|
||||||
|
+
|
||||||
|
+ [ipv6]
|
||||||
|
+ method=manual
|
||||||
|
+ may-fail=false
|
||||||
|
+ address1=fc00:1:2::2/64
|
||||||
|
+
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ "cloud-init-provisioningport.nmconnection": textwrap.dedent(
|
||||||
|
+ """\
|
||||||
|
+ # Generated by cloud-init. Changes will be lost.
|
||||||
|
+
|
||||||
|
+ [connection]
|
||||||
|
+ id=cloud-init provisioning0
|
||||||
|
+ uuid=d79b7b70-e9df-596f-ace7-89537db45684
|
||||||
|
+ autoconnect-priority=120
|
||||||
|
+ type=ethernet
|
||||||
|
+ slave-type=bridge
|
||||||
|
+ master=e5bd3f1a-cdcc-55d3-a6d8-88f1ba73bd0e
|
||||||
|
+
|
||||||
|
+ [user]
|
||||||
|
+ org.freedesktop.NetworkManager.origin=cloud-init
|
||||||
|
+
|
||||||
|
+ [ethernet]
|
||||||
|
+ mac-address=52:54:00:25:AE:12
|
||||||
|
+
|
||||||
|
+ """
|
||||||
|
+ ),
|
||||||
|
+ },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -7102,6 +7190,12 @@ class TestNetworkManagerRendering(CiTestCase):
|
||||||
|
entry[self.expected_name], self.expected_conf_d, found
|
||||||
|
)
|
||||||
|
|
||||||
|
+ def test_v2_bridges_set_name(self):
|
||||||
|
+ entry = NETWORK_CONFIGS["v2-bridges-set-name"]
|
||||||
|
+ 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
|
||||||
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 24.1.4
|
Version: 24.1.4
|
||||||
Release: 18%{?dist}
|
Release: 19%{?dist}
|
||||||
Summary: Cloud instance init scripts
|
Summary: Cloud instance init scripts
|
||||||
License: Apache-2.0 OR GPL-3.0-only
|
License: Apache-2.0 OR GPL-3.0-only
|
||||||
URL: https://github.com/canonical/cloud-init
|
URL: https://github.com/canonical/cloud-init
|
||||||
@ -57,6 +57,12 @@ Patch23: ci-Get-rid-of-gdisk-dependency.patch
|
|||||||
Patch24: ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch
|
Patch24: ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch
|
||||||
# For RHEL-54688 - [RHEL 10.0] cloud-init schema validation fails.
|
# For RHEL-54688 - [RHEL 10.0] cloud-init schema validation fails.
|
||||||
Patch25: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch
|
Patch25: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch
|
||||||
|
# For RHEL-65016 - Configuring metric for default gateway is not working [rhel-10]
|
||||||
|
Patch26: ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch
|
||||||
|
# For RHEL-65019 - NoCloud - network_config bridges incorrectly configured [rhel-10]
|
||||||
|
Patch27: ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch
|
||||||
|
# For RHEL-65019 - NoCloud - network_config bridges incorrectly configured [rhel-10]
|
||||||
|
Patch28: ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -267,6 +273,15 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 05 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-19
|
||||||
|
- ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch [RHEL-65016]
|
||||||
|
- ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch [RHEL-65019]
|
||||||
|
- ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch [RHEL-65019]
|
||||||
|
- Resolves: RHEL-65016
|
||||||
|
(Configuring metric for default gateway is not working [rhel-10])
|
||||||
|
- Resolves: RHEL-65019
|
||||||
|
(NoCloud - network_config bridges incorrectly configured [rhel-10])
|
||||||
|
|
||||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 24.1.4-18
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 24.1.4-18
|
||||||
- Bump release for October 2024 mass rebuild:
|
- Bump release for October 2024 mass rebuild:
|
||||||
Resolves: RHEL-64018
|
Resolves: RHEL-64018
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user