From 025b571a275d9c6143c38ebf81d07161d27518f0 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 24 Sep 2024 08:23:41 +0000 Subject: [PATCH] Import from CS git --- ...net-ipv4-ipv6-to-network-schema-5191.patch | 45 +++++++++++++++++++ SPECS/cloud-init.spec | 9 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 SOURCES/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch diff --git a/SOURCES/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch b/SOURCES/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch new file mode 100644 index 0000000..e49dd5f --- /dev/null +++ b/SOURCES/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch @@ -0,0 +1,45 @@ +From b424877c0e7673466e7bd354c1eed4db908ebab3 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: 143: fix: Add subnet ipv4/ipv6 to network schema (#5191) +RH-Jira: RHEL-54155 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Cathy Avery +RH-Commit: [1/1] d4c7beb80b8c67df6b6fc04db8d3b93ed82dd067 + +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 64c492a4..f485c784 100644 +--- a/cloudinit/config/schemas/schema-network-config-v1.json ++++ b/cloudinit/config/schemas/schema-network-config-v1.json +@@ -523,6 +523,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.45.1 + diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec index ab575dd..e964b87 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 23.4 -Release: 7%{?dist}.7 +Release: 7%{?dist}.8 Summary: Cloud instance init scripts Group: System Environment/Base @@ -55,6 +55,8 @@ Patch29: ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch Patch30: ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch # For RHEL-49742 - [Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource Patch31: ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch +# For RHEL-54155 - [RHEL 8.10] cloud-init schema validation fails. +Patch32: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch BuildArch: noarch @@ -270,6 +272,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Tue Aug 20 2024 Jon Maloy - 23.4-7.el8_10.8 +- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54155] +- Resolves: RHEL-54155 + ([RHEL 8.10] cloud-init schema validation fails.) + * Thu Jul 25 2024 Miroslav Rezanina - 23.4-7.el8_10.7 - ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch [RHEL-49742] - Resolves: RHEL-49742