Skip to content

Commit c2c13bd

Browse files
committed
Avoid deprecated systemd::service_limits
`systemd::service_limits` was deprecated voxpupuli/puppet-systemd#437
1 parent c9ee25c commit c2c13bd

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

manifests/instance.pp

+5-3
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,13 @@
483483
}
484484
} else {
485485
if $ulimit_managed {
486-
systemd::service_limits { "${service_name}.service":
487-
limits => {
486+
systemd::manage_dropin { "${service_name}-90-limits.conf":
487+
ensure => present,
488+
unit => "${service_name}.service",
489+
service_entry => {
488490
'LimitNOFILE' => $ulimit,
489491
},
490-
restart_service => false,
492+
notify_service => false,
491493
}
492494
}
493495
}

spec/classes/redis_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ class { 'redis':
109109
is_expected.to contain_file("/etc/systemd/system/#{service_name}.service.d/limit.conf").
110110
with_ensure('absent')
111111

112-
is_expected.to contain_systemd__service_limits("#{service_name}.service").
113-
with_limits({ 'LimitNOFILE' => 7777 }).
114-
with_restart_service(false).
115-
with_ensure('present')
112+
is_expected.to contain_systemd__manage_dropin("#{service_name}-90-limits.conf").
113+
with_service_entry({ 'LimitNOFILE' => 7777 }).
114+
with_ensure('present').
115+
with_unit("#{service_name}.service")
116116
end
117117
end
118118

0 commit comments

Comments
 (0)