Add support for Ubuntu 24.04

 - Use ntpsec package on Debian 12 and Ubuntu 24.04.
 - Set '/etc/default/ntpsec' as daemon_config path for ntpsec platforms.
 - Adjust specs for Ubuntu 24.04 tests.

Co-authored-by: Kjetil Torgrim Homme <[email protected]>

Author: shubhamshinde360

data/Debian-12.yaml

@@ -0,0 +1,4 @@
+---
+ntp::package_name:
+  - ntpsec
+ntp::config: '/etc/ntpsec/ntp.conf'

data/Ubuntu-24.04.yaml

@@ -0,0 +1,4 @@
+---
+ntp::package_name:
+  - ntpsec
+ntp::config: '/etc/ntpsec/ntp.conf'

manifests/config.pp

@@ -33,8 +33,22 @@
       }
     }
     'Debian': {
-      if $facts['os']['release']['major'] == '12' {
-        $daemon_config = '/etc/ntpsec/ntp.conf'
+      if $facts['os']['name'] == 'Ubuntu' {
+        # This ugly indentation is forced upon me by puppet-lint.  I disclaim
+        # any responsibility for damage to your eyes.
+        if (versioncmp($facts['os']['release']['major'], '18.04') >= 0 and
+          versioncmp($facts['os']['release']['major'], '24.04') < 0 and
+        $ntp::user) {
+          file_line { 'Set NTPD daemon user':
+            ensure => present,
+            path   => '/usr/lib/ntp/ntp-systemd-wrapper',
+            line   => "RUNASUSER=${ntp::user}",
+            match  => '^RUNASUSER\=',
+          }
+        }
+      }
+      if 'ntpsec' in $ntp::package_name {
+        $daemon_config = '/etc/default/ntpsec'
       } else {
         $daemon_config = '/etc/default/ntp'
       }
@@ -46,14 +60,6 @@
           match  => '^NTPD_OPTS\=',
         }
       }
-      if $ntp::user and $facts['os']['release']['major'] == '18.04' {
-        file_line { 'Set NTPD daemon user':
-          ensure => present,
-          path   => '/usr/lib/ntp/ntp-systemd-wrapper',
-          line   => "RUNASUSER=${ntp::user}",
-          match  => '^RUNASUSER\=',
-        }
-      }
     }
     'Suse': {
       $daemon_config = '/etc/sysconfig/ntp'

metadata.json

@@ -58,7 +58,8 @@
       "operatingsystemrelease": [
         "18.04",
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {

spec/acceptance/ntp_parameters_spec.rb

@@ -24,6 +24,8 @@
 
 config = if os[:family] == 'solaris'
            '/etc/inet/ntp.conf'
+         elsif os[:family] == 'ubuntu' && os[:release].start_with?('24')
+           '/etc/ntpsec/ntp.conf'
          else
            '/etc/ntp.conf'
          end

spec/acceptance/ntp_user_and_daemon_opts_spec.rb

@@ -29,21 +29,26 @@
            '/etc/sysconfig/ntp'
          elsif os[:family] == 'debian' && os[:release].start_with?('12')
            '/etc/ntpsec/ntp.conf'
+         elsif os[:family] == 'ubuntu' && os[:release].start_with?('24')
+           '/etc/default/ntpsec'
          else
            '/etc/default/ntp'
          end
 
-if os[:family] == 'debian' && os[:release].start_with?('12')
+if os[:family] == 'debian' && os[:release].to_i >= 12
   ntpd_opts_match = %r{(OPTIONS|NTPD_OPTS)='-g -i /var/lib/ntpsec'}
-  chroot_dir = '/var/lib/ntpsec'
+  chroot_opt = '-i /var/lib/ntpsec'
+elsif os[:family] == 'ubuntu' && os[:release].to_f >= 24.04
+  ntpd_opts_match = %r{(OPTIONS|NTPD_OPTS)='-g '}
+  chroot_opt = ''
 else
   ntpd_opts_match = %r{(OPTIONS|NTPD_OPTS)='-g -i /var/lib/ntp'}
-  chroot_dir = '/var/lib/ntp'
+  chroot_opt = '-i /var/lib/ntp'
 end
 
 describe 'ntp class with daemon options:', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) || (os[:release].start_with?('5') && os[:family] == 'redhat') do
   let(:pp) do
-    "class { 'ntp': service_enable => true, service_ensure => running, service_manage => true, service_name => '#{servicename}', user => 'ntp', daemon_extra_opts => '-g -i #{chroot_dir}' }"
+    "class { 'ntp': service_enable => true, service_ensure => running, service_manage => true, service_name => '#{servicename}', user => 'ntp', daemon_extra_opts => '-g #{chroot_opt}' }"
   end
 
   context 'when run' do

spec/acceptance/preferred_servers_spec.rb

@@ -4,6 +4,8 @@
 
 config = if os[:family] == 'solaris'
            '/etc/inet/ntp.conf'
+         elsif os[:family] == 'ubuntu' && os[:release].start_with?('24')
+           '/etc/ntpsec/ntp.conf'
          else
            '/etc/ntp.conf'
          end

spec/classes/ntp_spec.rb

@@ -9,6 +9,10 @@
     let(:conf_path) do
       if os.include?('solaris')
         '/etc/inet/ntp.conf'
+      elsif f[:os]['name'] == 'Debian' && f[:os]['release']['major'].to_f >= 12
+        '/etc/ntpsec/ntp.conf'
+      elsif f[:os]['name'] == 'Ubuntu' && f[:os]['release']['major'].to_f >= 24.04
+        '/etc/ntpsec/ntp.conf'
       else
         '/etc/ntp.conf'
       end
@@ -132,31 +136,31 @@
           case f[:os]['family']
           when 'RedHat'
             it 'uses the centos ntp servers' do
-              expect(subject).to contain_file('/etc/ntp.conf').with('content' => %r{server \d.centos.pool.ntp.org})
+              expect(subject).to contain_file(conf_path).with('content' => %r{server \d.centos.pool.ntp.org})
             end
 
             it do
               expect(subject).to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.centos.pool.ntp.org})
             end
           when 'Debian'
             it 'uses the debian ntp servers' do
-              expect(subject).to contain_file('/etc/ntp.conf').with('content' => %r{server \d.debian.pool.ntp.org iburst\n})
+              expect(subject).to contain_file(conf_path).with('content' => %r{server \d.debian.pool.ntp.org iburst\n})
             end
           when 'Suse'
             it 'uses the opensuse ntp servers' do
-              expect(subject).to contain_file('/etc/ntp.conf').with('content' => %r{server \d.opensuse.pool.ntp.org})
+              expect(subject).to contain_file(conf_path).with('content' => %r{server \d.opensuse.pool.ntp.org})
             end
           when 'FreeBSD'
             it 'uses the freebsd ntp servers' do
-              expect(subject).to contain_file('/etc/ntp.conf').with('content' => %r{server \d.freebsd.pool.ntp.org iburst maxpoll 9})
+              expect(subject).to contain_file(conf_path).with('content' => %r{server \d.freebsd.pool.ntp.org iburst maxpoll 9})
             end
           when 'Solaris'
             it 'uses the generic NTP pool servers' do
               expect(subject).to contain_file('/etc/inet/ntp.conf').with('content' => %r{server \d.pool.ntp.org})
             end
           when 'AIX'
             it 'uses the generic NTP pool servers on AIX' do
-              expect(subject).to contain_file('/etc/ntp.conf').with('content' => %r{server \d.pool.ntp.org})
+              expect(subject).to contain_file(conf_path).with('content' => %r{server \d.pool.ntp.org})
             end
           else
             it {