dc82d4f216
- Rebase to 24.4 [RHEL-66251] - Resolves: RHEL-66251 ([RHEL-9] Rebase cloud-init to 24.4 version)
87 lines
3.5 KiB
Diff
87 lines
3.5 KiB
Diff
From d05f201a13e2fdbd86c89647884ca08ae7d98b3a Mon Sep 17 00:00:00 2001
|
|
From: Camilla Conte <cconte@redhat.com>
|
|
Date: Fri, 3 Mar 2023 15:44:48 +0000
|
|
Subject: [PATCH] downstream: Add initial redhat changes
|
|
|
|
Adding minimal set of changes necessary for successful build of the package
|
|
on RHEL/CentOS 9 Stream koji.
|
|
|
|
Additional Changes on top of changes in 24.4 rebase:
|
|
- Merged all trivial downstream configuration commits
|
|
- Merged downstream patches
|
|
- c1a69d5e5 Remove dependency on python3-httpretty
|
|
- 69688c9cc Add warning during upgrade from an old version with null ssh_genkeytypes config
|
|
- bce114c96 Inform user when cloud-init generated config files are left during uninstalling
|
|
- 76de87b4e Rename render-cloudcfg -> render-template in spec file
|
|
|
|
Additional changes on top of changes in 23.4 rebase:
|
|
- Updated VERSION, TARSHA512, MARKER and BUILD_TARGET_RHEL parameters in
|
|
Makefile.common in .dist/
|
|
- In spec file, change the location of "disable-sshd-keygen-if-cloud-init-active.conf"
|
|
from /etc/systemd/system to /usr/lib/systemd/system
|
|
|
|
Additional changes on top of the changes in 23.1.1 rebase:
|
|
- Updated VERSION, TARSHA512, MARKER and BUILD_TARGET_RHEL parameters in
|
|
Makefile.common in .dist/
|
|
- Squashed unit test fixes for the downstream changes in cloudinit/settings.py.
|
|
|
|
Changes from 23.1.1 rebase follows:
|
|
|
|
Merged patches (23.1.1):
|
|
724a80ac Add TargetRelease
|
|
967a4405b rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
|
^ Merged since it removes hunks added in this commit itself
|
|
|
|
Discarded because not needed anymore (packit):
|
|
e3fd7ce12 Configure Packit to ignore the .gitignore file
|
|
e18654e9 Fixes for packit support
|
|
|
|
Discarded because file does not exist anymore and templates are aligned with upstream:
|
|
3576b12460bf18557857ee25df6bf530dab66612 Adding _netdev to the default mount configuration
|
|
8092b57ab245856ff1fdde1469960608a489c95e Remove rhel specific files
|
|
|
|
Added the following entry to %files to keep track of the new README file in config/clean.d/README
|
|
%doc %{_sysconfdir}/cloud/clean.d/README
|
|
|
|
ignored
|
|
c75e509b0 Revert "Revert "Setting highest autoconnect priority for network-scripts""
|
|
0eba5c619 Revert "Setting highest autoconnect priority for network-scripts"
|
|
|
|
ignored
|
|
ba19343c0d9807d0c68a2d8e4ab274f3ca884247 Add Gitlab CI
|
|
fe09305a5479a4814d6c46df07a906bafa29d637 Delete .gitlab-ci.yml
|
|
|
|
Conflicts:
|
|
missing rhel/ static files and "" instead of '' in setup.py
|
|
|
|
X-downstram-only: true
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
(cherry picked from commit 03345a88b8b0008a4a81e010d46290f5ba643ebc)
|
|
---
|
|
cloudinit/settings.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
index a73f25118..ea7ac283f 100644
|
|
--- a/cloudinit/settings.py
|
|
+++ b/cloudinit/settings.py
|
|
@@ -56,14 +56,15 @@ CFG_BUILTIN = {
|
|
],
|
|
"def_log_file": "/var/log/cloud-init.log",
|
|
"log_cfgs": [],
|
|
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
|
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
|
+ "syslog_fix_perms": [],
|
|
"system_info": {
|
|
"paths": {
|
|
"cloud_dir": "/var/lib/cloud",
|
|
"docs_dir": "/usr/share/doc/cloud-init/",
|
|
"templates_dir": "/etc/cloud/templates/",
|
|
},
|
|
- "distro": "ubuntu",
|
|
+ "distro": "rhel",
|
|
"network": {"renderers": None},
|
|
},
|
|
"vendor_data": {"enabled": True, "prefix": []},
|