From ed95a4168e5340fbef9aae2455651e039502a8a4 Mon Sep 17 00:00:00 2001 From: nofaralfasi Date: Thu, 20 Jun 2024 18:05:34 +0300 Subject: [PATCH] Fixes #37581 - Refactor timezone and NTP server config in kickstart Add conditional logic to use 'timesource' command, maintaining compatibility with older versions. --- .../provisioning_templates/provision/kickstart_default.erb | 7 +++++++ .../provision/Kickstart_default.rhel9_dhcp.snap.txt | 2 +- .../provision/Kickstart_default.rocky9_dhcp.snap.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/views/unattended/provisioning_templates/provision/kickstart_default.erb b/app/views/unattended/provisioning_templates/provision/kickstart_default.erb index ac1b054d0c8..db6c2e194f1 100644 --- a/app/views/unattended/provisioning_templates/provision/kickstart_default.erb +++ b/app/views/unattended/provisioning_templates/provision/kickstart_default.erb @@ -142,7 +142,14 @@ authselect --useshadow --passalgo=<%= @host.operatingsystem.password_hash.downca <% else -%> authconfig --useshadow --passalgo=<%= @host.operatingsystem.password_hash.downcase || 'sha256' %> --kickstart <% end -%> +<% if rhel_compatible && os_major < 9 -%> timezone --utc <%= host_param('time-zone') || 'UTC' %> <%= host_param('ntp-server') ? "--ntpservers #{host_param('ntp-server')}" : '' %> +<% else -%> +timezone --utc <%= host_param('time-zone') || 'UTC' %> +<% if host_param('ntp-server') -%> +timesource --ntp-server <%= host_param('ntp-server') %> +<% end -%> +<% end -%> <% if rhel_compatible -%> services --disabled gpm,sendmail,cups,pcmcia,isdn,rawdevices,hpoj,bluetooth,openibd,avahi-daemon,avahi-dnsconfd,hidd,hplip,pcscd diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt index dd63ad6cf76..2de4d2fec65 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt @@ -16,7 +16,7 @@ network --device=00-f0-54-1a-7e-e0 --hostname snapshot-ipv4-dhcp-rhel9 --noipv6 rootpw --iscrypted $1$rtd8Ub7R$5Ohzuy8WXlkaK9cA2T1wb0 firewall --service=ssh authselect --useshadow --passalgo=sha512 --kickstart -timezone --utc UTC +timezone --utc UTC services --disabled gpm,sendmail,cups,pcmcia,isdn,rawdevices,hpoj,bluetooth,openibd,avahi-daemon,avahi-dnsconfd,hidd,hplip,pcscd diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt index 67fd60bcea9..a2d66b755a8 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt @@ -16,7 +16,7 @@ network --device=00-f0-54-1a-7e-e0 --hostname snapshot-ipv4-dhcp-rocky9 --noipv6 rootpw --iscrypted $1$rtd8Ub7R$5Ohzuy8WXlkaK9cA2T1wb0 firewall --service=ssh authselect --useshadow --passalgo=sha512 --kickstart -timezone --utc UTC +timezone --utc UTC services --disabled gpm,sendmail,cups,pcmcia,isdn,rawdevices,hpoj,bluetooth,openibd,avahi-daemon,avahi-dnsconfd,hidd,hplip,pcscd