From 0c58783960f9bf4b0d36b650f821241ab592b156 Mon Sep 17 00:00:00 2001
From: pneigel-ca <48532268+pneigel-ca@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:25:30 -0400
Subject: [PATCH 1/4] change org type

---
 cloudinit/config/schemas/schema-cloud-config-v1.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
index 5d20242791e..187d3eb9d52 100644
--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
+++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
@@ -2478,8 +2478,8 @@
               "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``"
+              "type": "string",
+              "description": "The organization name to use. Must be used with ``activation-key``. Should not be used with ``username`` or ``password``"
             },
             "auto-attach": {
               "type": "boolean",

From ccbfe196dc26e74dd4f28962e2e6a817c6333f4d Mon Sep 17 00:00:00 2001
From: pneigel-ca <48532268+pneigel-ca@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:26:28 -0400
Subject: [PATCH 2/4] update unit test

---
 tests/unittests/config/test_cc_rh_subscription.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unittests/config/test_cc_rh_subscription.py b/tests/unittests/config/test_cc_rh_subscription.py
index 955b092ba16..e4646ebc8c1 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",
         }
     }
 

From 481534b3c1ab0a176041c2bc593000e6560b99f7 Mon Sep 17 00:00:00 2001
From: pneigel-ca <48532268+pneigel-ca@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:35:44 -0400
Subject: [PATCH 3/4] Update .github-cla-signers

---
 tools/.github-cla-signers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index cafe0353bff..b5e96370c26 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -140,6 +140,7 @@ outscale-mdr
 philsphicas
 phsm
 phunyguy
+pneigel-ca
 qubidt
 r00ta
 RedKrieg

From 505e185051542a63de7e612d15810a153030334a Mon Sep 17 00:00:00 2001
From: pneigel-ca <48532268+pneigel-ca@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:37:29 -0400
Subject: [PATCH 4/4] changes in cc_rh_subscription.py with new schema

---
 cloudinit/config/cc_rh_subscription.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
index 95bc2b2e437..789d7fd4965 100644
--- a/cloudinit/config/cc_rh_subscription.py
+++ b/cloudinit/config/cc_rh_subscription.py
@@ -47,14 +47,14 @@
             """\
             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: