2023-09-21 18:10:28 +00:00
|
|
|
From c4d66915520554adedff9be7396f877cd1a5525c Mon Sep 17 00:00:00 2001
|
2022-09-27 11:01:58 +00:00
|
|
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
2023-09-21 18:10:28 +00:00
|
|
|
Date: Mon, 6 Mar 2023 16:37:20 +0100
|
|
|
|
|
Subject: [PATCH] Add initial redhat changes
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
Adding minimal set of changes necessary for successful build of the package
|
|
|
|
|
on RHEL/CentOS 9 Stream koji.
|
2022-09-27 11:01:58 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
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
|
2022-09-27 11:01:58 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
Discarded because not needed anymore (packit):
|
|
|
|
|
e3fd7ce12 Configure Packit to ignore the .gitignore file
|
|
|
|
|
e18654e9 Fixes for packit support
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
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
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
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
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
ignored
|
|
|
|
|
c75e509b0 Revert "Revert "Setting highest autoconnect priority for network-scripts""
|
|
|
|
|
0eba5c619 Revert "Setting highest autoconnect priority for network-scripts"
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
ignored
|
|
|
|
|
ba19343c0d9807d0c68a2d8e4ab274f3ca884247 Add Gitlab CI
|
|
|
|
|
fe09305a5479a4814d6c46df07a906bafa29d637 Delete .gitlab-ci.yml
|
2021-11-02 09:32:57 +00:00
|
|
|
|
|
|
|
|
Conflicts:
|
2023-09-21 18:10:28 +00:00
|
|
|
missing rhel/ static files and "" instead of '' in setup.py
|
2021-11-02 09:32:57 +00:00
|
|
|
|
2023-09-21 18:10:28 +00:00
|
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
2021-11-02 09:32:57 +00:00
|
|
|
---
|
2023-09-21 18:10:28 +00:00
|
|
|
cloudinit/settings.py | 5 +++--
|
|
|
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
2021-11-02 09:32:57 +00:00
|
|
|
|
|
|
|
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
2023-09-21 18:10:28 +00:00
|
|
|
index 8684d003..edbb217d 100644
|
2021-11-02 09:32:57 +00:00
|
|
|
--- a/cloudinit/settings.py
|
|
|
|
|
+++ b/cloudinit/settings.py
|
2023-09-21 18:10:28 +00:00
|
|
|
@@ -53,13 +53,14 @@ CFG_BUILTIN = {
|
2021-11-02 09:32:57 +00:00
|
|
|
],
|
2023-09-21 18:10:28 +00:00
|
|
|
"def_log_file": "/var/log/cloud-init.log",
|
|
|
|
|
"log_cfgs": [],
|
2022-09-27 11:01:58 +00:00
|
|
|
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
2023-09-21 18:10:28 +00:00
|
|
|
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
|
|
|
|
+ "syslog_fix_perms": [],
|
|
|
|
|
"system_info": {
|
|
|
|
|
"paths": {
|
|
|
|
|
"cloud_dir": "/var/lib/cloud",
|
|
|
|
|
"templates_dir": "/etc/cloud/templates/",
|
2021-11-02 09:32:57 +00:00
|
|
|
},
|
2022-09-27 11:01:58 +00:00
|
|
|
- "distro": "ubuntu",
|
2023-09-21 18:10:28 +00:00
|
|
|
+ "distro": "rhel",
|
|
|
|
|
"network": {"renderers": None},
|
2021-11-02 09:32:57 +00:00
|
|
|
},
|
2022-09-27 11:01:58 +00:00
|
|
|
"vendor_data": {"enabled": True, "prefix": []},
|
