Merge pull request #514 from traylenator/theres_no_limits

Avoid deprecated systemd::service_limits
voxpupuli · Apr 15, 2024 · 2d7b5b9 · 2d7b5b9
2 parents c9ee25c + c2c13bd
commit 2d7b5b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -483,11 +483,13 @@
     }
   } else {
     if $ulimit_managed {
-      systemd::service_limits { "${service_name}.service":
-        limits          => {
+      systemd::manage_dropin { "${service_name}-90-limits.conf":
+        ensure         => present,
+        unit           => "${service_name}.service",
+        service_entry  => {
           'LimitNOFILE' => $ulimit,
         },
-        restart_service => false,
+        notify_service => false,
       }
     }
   }

diff --git a/spec/classes/redis_spec.rb b/spec/classes/redis_spec.rb
@@ -109,10 +109,10 @@ class { 'redis':
             is_expected.to contain_file("/etc/systemd/system/#{service_name}.service.d/limit.conf").
               with_ensure('absent')
 
-            is_expected.to contain_systemd__service_limits("#{service_name}.service").
-              with_limits({ 'LimitNOFILE' => 7777 }).
-              with_restart_service(false).
-              with_ensure('present')
+            is_expected.to contain_systemd__manage_dropin("#{service_name}-90-limits.conf").
+              with_service_entry({ 'LimitNOFILE' => 7777 }).
+              with_ensure('present').
+              with_unit("#{service_name}.service")
           end
         end