replace systemd::service_limits with systemd::manage_dropin (#169)

saz · May 20, 2024 · 5c57896 · 5c57896
1 parent 4071e5b
commit 5c57896
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -4,6 +4,4 @@ fixtures:
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
     svcprop: 'https://github.com/bolthole/puppet-svcprop.git'
     selinux: 'https://github.com/voxpupuli/puppet-selinux.git'
-    systemd:
-      repo: 'https://github.com/camptocamp/puppet-systemd.git'
-      ref: '2.12.0'
+    systemd: 'https://github.com/camptocamp/puppet-systemd.git'
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -38,8 +38,11 @@
   }
 
   if $limits {
-    systemd::service_limits { $service_name:
-      limits => $limits,
+    systemd::manage_dropin { "${service_name}-90-limits.conf":
+      unit           => $service_name,
+      filename       => '90-limits.conf',
+      notify_service => true,
+      service_entry  => $limits,
     }
   }
 

diff --git a/metadata.json b/metadata.json
@@ -14,7 +14,7 @@
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.13.1 < 10.0.0"},
     {"name":"puppetlabs/firewall","version_requirement":">= 0.1.0 < 9.0.0"},
-    {"name":"puppet/systemd","version_requirement":">= 2.10.0 < 8.0.0"},
+    {"name":"puppet/systemd","version_requirement":">= 6.0.0 < 8.0.0"},
     {"name":"puppet/selinux","version_requirement":">= 3.2.0 < 5.0.0"}
   ],
   "operatingsystem_support": [

diff --git a/spec/defines/instance_spec.rb b/spec/defines/instance_spec.rb
@@ -42,7 +42,7 @@
           it { is_expected.to contain_class('memcached::instance::servicefile') }
           it { is_expected.to contain_service('memcached@3489.service') }
           it { is_expected.to contain_systemd__unit_file('memcached@.service') }
-          it { is_expected.to contain_systemd__Service_limits('memcached@3489.service') }
+          it { is_expected.to contain_systemd__Manage_dropin('memcached@3489.service-90-limits.conf') }
         end
 
         context 'with overrides' do