rpms/cloud-init
7
1
Fork 1
Code Issues Pull Requests Releases Activity

Bring back cc_resolv_conf.py and DataSourceRbxCloud.py modifications

Browse Source
This commit is contained in:
Andrew Lukoshko 2025-03-13 16:25:29 +00:00
parent 6d8b474b9d
commit 34e8bdf192
1 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
SOURCES/0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
View File

@ -1,26 +1,28 @@
From 25dc8023e0bfb131e6e8171e78bb5939a29525e0 Mon Sep 17 00:00:00 2001 From 4650b8c8819bd6b9f6163567f2b8f8e94ee5ee3c Mon Sep 17 00:00:00 2001
From: Elkhan Mammadli <elkhan.mammadli@protonmail.com> From: Elkhan Mammadli <elkhan.mammadli@protonmail.com>
Date: Thu, 13 Mar 2025 18:23:03 +0400 Date: Thu, 13 Mar 2025 18:23:03 +0400
Subject: [PATCH] fix: fix and improve almalinux and cloudlinux support Subject: [PATCH] Improvements for AlmaLinux OS and CloudLinux OS
- Fix cc_ntp module. - Fix cc_ntp module.
- Add support to cc_ca_certs module. - Add support to cc_ca_certs module.
- Improve support for systemd integration. - Improve support for systemd integration.
Signed-off-by: Elkhan Mammadli <elkhan.mammadli@protonmail.com> Signed-off-by: Andrew Lukoshko <alukoshko@almalinux.org>
--- ---
cloudinit/config/cc_ca_certs.py | 8 ++++ cloudinit/config/cc_ca_certs.py | 8 ++++
cloudinit/config/cc_ntp.py | 3 ++ cloudinit/config/cc_ntp.py | 3 ++
cloudinit/settings.py | 2 +- cloudinit/config/cc_resolv_conf.py | 2 +
systemd/cloud-config.service.tmpl | 2 +- cloudinit/settings.py | 2 +-
systemd/cloud-final.service.tmpl | 4 +- cloudinit/sources/DataSourceRbxCloud.py | 2 +-
systemd/cloud-init-local.service.tmpl | 12 ++--- systemd/cloud-config.service.tmpl | 2 +-
systemd/cloud-init.service.tmpl | 4 +- systemd/cloud-final.service.tmpl | 4 +-
templates/chrony.conf.almalinux.tmpl | 51 +++++++++++++++++++++ systemd/cloud-init-local.service.tmpl | 12 ++---
templates/chrony.conf.cloudlinux.tmpl | 51 +++++++++++++++++++++ systemd/cloud-init.service.tmpl | 4 +-
templates/ntp.conf.almalinux.tmpl | 64 +++++++++++++++++++++++++++ templates/chrony.conf.almalinux.tmpl | 51 ++++++++++++++++++++
templates/ntp.conf.cloudlinux.tmpl | 64 +++++++++++++++++++++++++++ templates/chrony.conf.cloudlinux.tmpl | 51 ++++++++++++++++++++
11 files changed, 253 insertions(+), 12 deletions(-) templates/ntp.conf.almalinux.tmpl | 64 +++++++++++++++++++++++++
templates/ntp.conf.cloudlinux.tmpl | 64 +++++++++++++++++++++++++
13 files changed, 256 insertions(+), 13 deletions(-)
create mode 100644 templates/chrony.conf.almalinux.tmpl create mode 100644 templates/chrony.conf.almalinux.tmpl
create mode 100644 templates/chrony.conf.cloudlinux.tmpl create mode 100644 templates/chrony.conf.cloudlinux.tmpl
create mode 100644 templates/ntp.conf.almalinux.tmpl create mode 100644 templates/ntp.conf.almalinux.tmpl
@ -66,6 +68,20 @@ index 9eef24f..653db7d 100644
# The schema definition for each cloud-config module is a strict contract for # The schema definition for each cloud-config module is a strict contract for
# describing supported configuration parameters for each cloud-config section. # describing supported configuration parameters for each cloud-config section.
# It allows cloud-config to validate and alert users to invalid or ignored # It allows cloud-config to validate and alert users to invalid or ignored
diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
index aa88919..4eb1d76 100644
--- a/cloudinit/config/cc_resolv_conf.py
+++ b/cloudinit/config/cc_resolv_conf.py
@@ -57,7 +57,9 @@ meta: MetaSchema = {
"title": "Configure resolv.conf",
"description": MODULE_DESCRIPTION,
"distros": [
+ "almalinux",
"alpine",
+ "cloudlinux",
"fedora",
"mariner",
"opensuse",
diff --git a/cloudinit/settings.py b/cloudinit/settings.py diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index 3a581e5..def6d4b 100644 index 3a581e5..def6d4b 100644
--- a/cloudinit/settings.py --- a/cloudinit/settings.py
@ -79,6 +95,19 @@ index 3a581e5..def6d4b 100644
"network": {"renderers": None}, "network": {"renderers": None},
}, },
"vendor_data": {"enabled": True, "prefix": []}, "vendor_data": {"enabled": True, "prefix": []},
diff --git a/cloudinit/sources/DataSourceRbxCloud.py b/cloudinit/sources/DataSourceRbxCloud.py
index 9214f1b..14880ec 100644
--- a/cloudinit/sources/DataSourceRbxCloud.py
+++ b/cloudinit/sources/DataSourceRbxCloud.py
@@ -60,7 +60,7 @@ def _sub_arp(cmd):
def gratuitous_arp(items, distro):
source_param = "-S"
- if distro.name in ["fedora", "centos", "rhel"]:
+ if distro.name in ["almalinux", "fedora", "centos", "cloudlinux", "rhel"]:
source_param = "-s"
for item in items:
try:
diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
index 76e50ae..047969a 100644 index 76e50ae..047969a 100644
--- a/systemd/cloud-config.service.tmpl --- a/systemd/cloud-config.service.tmpl
@ -440,5 +469,5 @@ index 0000000..6d166aa
+# Enable writing of statistics records. +# Enable writing of statistics records.
+#statistics clockstats cryptostats loopstats peerstats +#statistics clockstats cryptostats loopstats peerstats
-- --
2.48.1 2.43.5