Fix specs and don't pass 'daemon_extra_opts' to ubuntu-24.04

Author: shubhamshinde360

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