421b4f21fd
- ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch [RHEL-44334] - ci-fix-jsonschema-Add-missing-sudo-definition-5418.patch [RHEL-44338] - ci-doc-update-examples-to-reflect-alternative-ways-to-p.patch [RHEL-44338] - ci-Update-pylint-version-to-support-python-3.12-5338.patch [RHEL-44599] - Resolves: RHEL-44334 ([RHEL-10] cloud-init fails to configure DNS search domains) - Resolves: RHEL-44338 ([RHEL-10] fix `SUDO` configuration schema for users and groups) - Resolves: RHEL-44599 ([rhel-10] fix pylint error and support python 3.12)
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 77fdb71d8947b4bc3b0fb19c2a0dbf0423c51163 Mon Sep 17 00:00:00 2001
|
|
From: Brett Holman <brett.holman@canonical.com>
|
|
Date: Wed, 19 Jun 2024 17:07:56 -0600
|
|
Subject: [PATCH 2/4] fix(jsonschema): Add missing sudo definition (#5418)
|
|
|
|
RH-Author: Ani Sinha <anisinha@redhat.com>
|
|
RH-MergeRequest: 91: fix(jsonschema): Add missing sudo definition (#5418)
|
|
RH-Jira: RHEL-44338
|
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [1/2] c94e7e63470d04c23ebb45fe654c7bdd5a30c162 (anisinha/cloud-init)
|
|
|
|
This configuration:
|
|
|
|
```
|
|
users:
|
|
- name: osadmin
|
|
lock_passwd: false
|
|
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
|
```
|
|
|
|
Is valid syntax but is missing from the jsonschema definition.
|
|
|
|
Fixes GH-5399
|
|
|
|
(cherry picked from commit b533fa51acb850ed754e2b1925e276ff8e5f3507)
|
|
---
|
|
cloudinit/config/schemas/schema-cloud-config-v1.json | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
|
|
index ff61dcaa..c47e7c4f 100644
|
|
--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
|
|
+++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
|
|
@@ -388,6 +388,15 @@
|
|
],
|
|
"description": "Sudo rule to use or false. Absence of a sudo value or ``null`` will result in no sudo rules added for this user."
|
|
},
|
|
+ {
|
|
+ "type": "array",
|
|
+ "items": {
|
|
+ "type": [
|
|
+ "string",
|
|
+ "null"
|
|
+ ]
|
|
+ }
|
|
+ },
|
|
{
|
|
"type": "boolean",
|
|
"changed": true,
|
|
--
|
|
2.39.3
|
|
|