From fdbb25a2d514f9e956af5017032ffe9b7c473258 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 26 Aug 2024 04:18:44 -0400 Subject: [PATCH] * Mon Aug 26 2024 Miroslav Rezanina - 24.1.4-17 - ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54688] - Resolves: RHEL-54688 ([RHEL 10.0] cloud-init schema validation fails.) --- ...net-ipv4-ipv6-to-network-schema-5191.patch | 45 +++++++++++++++++++ cloud-init.spec | 9 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch diff --git a/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch b/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch new file mode 100644 index 0000000..34e9448 --- /dev/null +++ b/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch @@ -0,0 +1,45 @@ +From a6d02d8c4b4744e94638262ca28f998085f2558c Mon Sep 17 00:00:00 2001 +From: James Falcon +Date: Thu, 18 Apr 2024 20:27:27 -0500 +Subject: [PATCH] fix: Add subnet ipv4/ipv6 to network schema (#5191) + +RH-Author: Ani Sinha +RH-MergeRequest: 110: fix: Add subnet ipv4/ipv6 to network schema (#5191) +RH-Jira: RHEL-54688 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Cathy Avery +RH-Commit: [1/1] a63b3c5f534155aaff36cec137fe1ad7d2f9ed6b (anisinha/cloud-init) + +These are used by our openstack network_data.json parsing code and +get used by the sysconfig renderer. + +Fixes GH-4911 + +(cherry picked from commit 0b1ca174095e3ad685e6d6649bb08aafb19a95b9) +Signed-off-by: Ani Sinha +--- + cloudinit/config/schemas/schema-network-config-v1.json | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json +index 78628178..6f97f571 100644 +--- a/cloudinit/config/schemas/schema-network-config-v1.json ++++ b/cloudinit/config/schemas/schema-network-config-v1.json +@@ -532,6 +532,14 @@ + "items": { + "$ref": "#/$defs/anyOf_type_route" + } ++ }, ++ "ipv4": { ++ "type": "boolean", ++ "description": "Indicate if the subnet is IPv4. If not specified, it will be inferred from the subnet type or address. This exists for compatibility with OpenStack's ``network_data.json`` when rendered through sysconfig." ++ }, ++ "ipv6": { ++ "type": "boolean", ++ "description": "Indicate if the subnet is IPv6. If not specified, it will be inferred from the subnet type or address. This is exists for compatibility with OpenStack's ``network_data.json`` when rendered through sysconfig." + } + } + }, +-- +2.39.3 + diff --git a/cloud-init.spec b/cloud-init.spec index 8b9bab0..341432f 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 24.1.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Cloud instance init scripts License: Apache-2.0 OR GPL-3.0-only URL: https://github.com/canonical/cloud-init @@ -55,6 +55,8 @@ Patch22: ci-cc_disk_setup-add-sgdisk-to-sfdisk-convertion-dictio.patch Patch23: ci-Get-rid-of-gdisk-dependency.patch # For RHEL-54372 - [RHEL10]Revert "fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr (#5471)" 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. +Patch25: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch BuildArch: noarch @@ -265,6 +267,11 @@ fi %changelog +* Mon Aug 26 2024 Miroslav Rezanina - 24.1.4-17 +- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54688] +- Resolves: RHEL-54688 + ([RHEL 10.0] cloud-init schema validation fails.) + * Mon Aug 19 2024 Miroslav Rezanina - 24.1.4-16 - ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch [RHEL-54372] - Resolves: RHEL-54372