0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch

SOURCES/ci-fix-rh_subscription-add-string-type-to-org-5453.patch

@@ -0,0 +1,131 @@
+From 9066bea7bebf583f81f841ae7f8c99728df4982f Mon Sep 17 00:00:00 2001
+From: Alberto Contreras <alberto.contreras@canonical.com>
+Date: Mon, 1 Jul 2024 21:04:21 +0200
+Subject: [PATCH] fix(rh_subscription): add string type to org (#5453)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 158: fix(rh_subscription): add string type to org (#5453)
+RH-Jira: RHEL-81163
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Commit: [1/1] 0210968f6630cc3a10d8f4f16f274280f00fabb0
+
+Per [1], org's correct type is string. Added as new type and deprecated
+integer.
+
+References:
+[1] https://github.com/candlepin/subscription-manager/blob/b6fad11e7783ae414fe88fdecee57d8db5c8e292/man/subscription-manager.8#L589
+
+Fixes GH-5382
+
+One conflict fixed: doc/module-docs/cc_rh_subscription/example2.yaml
+is absent in 23.4 since it was added as a part of
+f9352b9467626d ("chore(doc): migrate cc modules i through r to templates (#5313)")
+later.
+
+Co-authored-by: pneigel-ca <patrick.neigel@gmail.com>
+(cherry picked from commit 681b7de1a598bc5ab1b7d9868dcf2f32fd45aba3)
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+---
+ cloudinit/config/cc_rh_subscription.py           |  4 ++--
+ .../config/schemas/schema-cloud-config-v1.json   | 14 ++++++++++++--
+ .../unittests/config/test_cc_rh_subscription.py  | 16 +++++++++++++++-
+ tools/.github-cla-signers                        |  1 +
+ 4 files changed, 30 insertions(+), 5 deletions(-)
+
+diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
+index 83fa4f61..b2588915 100644
+--- a/cloudinit/config/cc_rh_subscription.py
++++ b/cloudinit/config/cc_rh_subscription.py
+@@ -47,14 +47,14 @@ meta: MetaSchema = {
+             """\
+             rh_subscription:
+                 activation-key: foobar
+-                org: 12345
++                org: "ABC"
+             """
+         ),
+         dedent(
+             """\
+             rh_subscription:
+                 activation-key: foobar
+-                org: 12345
++                org: "ABC"
+                 auto-attach: true
+                 service-level: self-support
+                 add-pool:
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index c5f46f37..6e4fcca9 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -2451,8 +2451,18 @@
+               "description": "The activation key to use. Must be used with ``org``. Should not be used with ``username`` or ``password``"
+             },
+             "org": {
+-              "type": "integer",
+-              "description": "The organization number to use. Must be used with ``activation-key``. Should not be used with ``username`` or ``password``"
++              "description": "The organization to use. Must be used with ``activation-key``. Should not be used with ``username`` or ``password``",
++              "oneOf": [
++                {
++                  "type": "string"
++                },
++                {
++                  "type": "integer",
++                  "deprecated": true,
++                  "deprecated_version": "24.2",
++                  "deprecated_description": "Use of type integer for this value is deprecated. Use a string instead."
++                }
++              ]
+             },
+             "auto-attach": {
+               "type": "boolean",
+diff --git a/tests/unittests/config/test_cc_rh_subscription.py b/tests/unittests/config/test_cc_rh_subscription.py
+index 955b092b..d811d16a 100644
+--- a/tests/unittests/config/test_cc_rh_subscription.py
++++ b/tests/unittests/config/test_cc_rh_subscription.py
+@@ -184,7 +184,7 @@ class TestBadInput(CiTestCase):
+         "rh_subscription": {
+             "activation-key": "abcdef1234",
+             "fookey": "bar",
+-            "org": "123",
++            "org": "ABC",
+         }
+     }
+ 
+@@ -330,6 +330,20 @@ class TestRhSubscriptionSchema:
+                 {"rh_subscription": {"disable-repo": "name"}},
+                 "'name' is not of type 'array'",
+             ),
++            (
++                {
++                    "rh_subscription": {
++                        "activation-key": "foobar",
++                        "org": "ABC",
++                    }
++                },
++                None,
++            ),
++            (
++                {"rh_subscription": {"activation-key": "foobar", "org": 314}},
++                "Deprecated in version 24.2. Use of type integer for this"
++                " value is deprecated. Use a string instead.",
++            ),
+         ],
+     )
+     @skipUnlessJsonSchema()
+diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
+index 8b119025..fc95f611 100644
+--- a/tools/.github-cla-signers
++++ b/tools/.github-cla-signers
+@@ -125,6 +125,7 @@ Oursin
+ outscale-mdr
+ phsm
+ phunyguy
++pneigel-ca
+ qubidt
+ r00ta
+ RedKrieg
+-- 
+2.48.1
+

SPECS/cloud-init.spec

@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        23.4
-Release:              19%{?dist}.5.alma.1
+Release:        19%{?dist}.6.alma.1
 Summary:        Cloud instance init scripts
 License:        ASL 2.0 or GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -81,6 +81,8 @@ Patch39:              ci-Prevent-NM-from-handling-DNS-when-network-interfaces.pa
 Patch40: ci-refactor-Ensure-internal-DNS-state-same-for-v1-and-v.patch
 # For RHEL-79774 - [RHEL 9] Backport support for smbios datasource definition [rhel-9.5.z]
 Patch41: ci-fix-nocloud-smbios-datasource-definition.patch
+# For RHEL-81163 - Cloud-init fails to subscribe system if activation key 'org' is not an integer [rhel-9.5.z]
+Patch42: ci-fix-rh_subscription-add-string-type-to-org-5453.patch
 
 # AlmaLinux Patch
 Patch3100: 0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
@@ -298,9 +300,14 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
-* Tue Mar 25 2025 Elkhan Mammadli <elkhan@almalinux.org> - 23.4-19.5.alma.1
+* Thu May 08 2025 Elkhan Mammadli <elkhan@almalinux.org> - 23.4-19.6.alma.1
 - 0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
 
+* Tue Apr 01 2025 Jon Maloy <jmaloy@redhat.com> - 23.4-19.el9_5.6
+- ci-fix-rh_subscription-add-string-type-to-org-5453.patch [RHEL-81163]
+- Resolves: RHEL-81163
+  (Cloud-init fails to subscribe system if activation key 'org' is not an integer [rhel-9.5.z])
+
 * Mon Feb 24 2025 Jon Maloy <jmaloy@redhat.com> - 23.4-19.el9_5.5
 - ci-fix-nocloud-smbios-datasource-definition.patch [RHEL-79774]
 - Resolves: RHEL-79774