Skip to content

Commit 3a3b3ab

Browse files
committed
Remove deprecated systemd::service_limits type
The `systemd::service_limits` has been emitting `deprecated` warnings since #437 released with version v7.0.0 of puppet-systemd. Purge all systemd::service_limits code.
1 parent 009f5d6 commit 3a3b3ab

File tree

7 files changed

+0
-433
lines changed

7 files changed

+0
-433
lines changed

REFERENCE.md

Lines changed: 0 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
* [`systemd::modules_load`](#systemd--modules_load): Creates a modules-load.d drop file
3939
* [`systemd::network`](#systemd--network): Creates network config for systemd-networkd
4040
* [`systemd::networkd::interface`](#systemd--networkd--interface): This class implements a network interface file for systemd-networkd
41-
* [`systemd::service_limits`](#systemd--service_limits): Deprecated - Adds a set of custom limits to the service
4241
* [`systemd::timer`](#systemd--timer): Create a timer and optionally a service unit to execute with the timer unit
4342
* [`systemd::timer_wrapper`](#systemd--timer_wrapper): Helper to define timer and accompanying services for a given task (cron like interface).
4443
* [`systemd::tmpfile`](#systemd--tmpfile): Creates a systemd tmpfile
@@ -163,7 +162,6 @@
163162
* [`Systemd::MachineInfoSettings`](#Systemd--MachineInfoSettings): Matches Systemd machine-info (hostnamectl) file Struct
164163
* [`Systemd::OomdSettings`](#Systemd--OomdSettings): Configurations for oomd.conf
165164
* [`Systemd::Output`](#Systemd--Output): Defines allowed output values
166-
* [`Systemd::ServiceLimits`](#Systemd--ServiceLimits): Deprecated - Matches Systemd Service Limit Struct
167165
* [`Systemd::ServiceManagerSettings`](#Systemd--ServiceManagerSettings): Matches Systemd system.conf/user.conf settings
168166
* [`Systemd::SettingEnsure`](#Systemd--SettingEnsure): Defines allowed ensure states for an ini_setting
169167
* [`Systemd::Timespan`](#Systemd--Timespan): Defines a timespan type
@@ -199,7 +197,6 @@ This module allows triggering systemd commands once for all modules
199197
The following parameters are available in the `systemd` class:
200198

201199
* [`default_target`](#-systemd--default_target)
202-
* [`service_limits`](#-systemd--service_limits)
203200
* [`networks`](#-systemd--networks)
204201
* [`timers`](#-systemd--timers)
205202
* [`tmpfiles`](#-systemd--tmpfiles)
@@ -282,14 +279,6 @@ The default systemd boot target, unmanaged if set to undef.
282279

283280
Default value: `undef`
284281

285-
##### <a name="-systemd--service_limits"></a>`service_limits`
286-
287-
Data type: `Stdlib::CreateResources`
288-
289-
Deprecated, use dropin_files - Hash of `systemd::service_limits` resources
290-
291-
Default value: `{}`
292-
293282
##### <a name="-systemd--networks"></a>`networks`
294283

295284
Data type: `Stdlib::CreateResources`
@@ -2077,83 +2066,6 @@ The structure is equal to the 'network' parameter of an interface.
20772066

20782067
Default value: `{}`
20792068

2080-
### <a name="systemd--service_limits"></a>`systemd::service_limits`
2081-
2082-
Deprecated - Adds a set of custom limits to the service
2083-
2084-
* **See also**
2085-
* systemd.exec(5)
2086-
2087-
#### Parameters
2088-
2089-
The following parameters are available in the `systemd::service_limits` defined type:
2090-
2091-
* [`name`](#-systemd--service_limits--name)
2092-
* [`ensure`](#-systemd--service_limits--ensure)
2093-
* [`path`](#-systemd--service_limits--path)
2094-
* [`selinux_ignore_defaults`](#-systemd--service_limits--selinux_ignore_defaults)
2095-
* [`limits`](#-systemd--service_limits--limits)
2096-
* [`source`](#-systemd--service_limits--source)
2097-
* [`restart_service`](#-systemd--service_limits--restart_service)
2098-
2099-
##### <a name="-systemd--service_limits--name"></a>`name`
2100-
2101-
Data type: `Pattern['^.+\.(service|socket|mount|swap)$']`
2102-
2103-
The name of the service that you will be modifying
2104-
2105-
##### <a name="-systemd--service_limits--ensure"></a>`ensure`
2106-
2107-
Data type: `Enum['present', 'absent', 'file']`
2108-
2109-
Whether to drop a file or remove it
2110-
2111-
Default value: `'present'`
2112-
2113-
##### <a name="-systemd--service_limits--path"></a>`path`
2114-
2115-
Data type: `Stdlib::Absolutepath`
2116-
2117-
The path to the main systemd settings directory
2118-
2119-
Default value: `'/etc/systemd/system'`
2120-
2121-
##### <a name="-systemd--service_limits--selinux_ignore_defaults"></a>`selinux_ignore_defaults`
2122-
2123-
Data type: `Boolean`
2124-
2125-
If Puppet should ignore the default SELinux labels.
2126-
2127-
Default value: `false`
2128-
2129-
##### <a name="-systemd--service_limits--limits"></a>`limits`
2130-
2131-
Data type: `Optional[Systemd::ServiceLimits]`
2132-
2133-
A Hash of service limits matching the settings in ``systemd.exec(5)``
2134-
2135-
* Mutually exclusive with ``$source``
2136-
2137-
Default value: `undef`
2138-
2139-
##### <a name="-systemd--service_limits--source"></a>`source`
2140-
2141-
Data type: `Optional[String]`
2142-
2143-
A ``File`` resource compatible ``source``
2144-
2145-
* Mutually exclusive with ``$limits``
2146-
2147-
Default value: `undef`
2148-
2149-
##### <a name="-systemd--service_limits--restart_service"></a>`restart_service`
2150-
2151-
Data type: `Boolean`
2152-
2153-
Unused parameter for compatibility with older versions. Will fail if true is passed in.
2154-
2155-
Default value: `false`
2156-
21572069
### <a name="systemd--timer"></a>`systemd::timer`
21582070

21592071
Create a timer and optionally a service unit to execute with the timer unit
@@ -5500,59 +5412,6 @@ Used in DefaultStandardOutput/DefaultStandardError e.g.
55005412

55015413
Alias of `Enum['inherit', 'null', 'tty', 'journal', 'journal+console', 'kmsg', 'kmsg+console']`
55025414

5503-
### <a name="Systemd--ServiceLimits"></a>`Systemd::ServiceLimits`
5504-
5505-
Deprecated - Matches Systemd Service Limit Struct
5506-
5507-
Alias of
5508-
5509-
```puppet
5510-
Struct[{
5511-
Optional['LimitCPU'] => Pattern['^\d+(s|m|h|d|w|M|y)?(:\d+(s|m|h|d|w|M|y)?)?$'],
5512-
Optional['LimitFSIZE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5513-
Optional['LimitDATA'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5514-
Optional['LimitSTACK'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5515-
Optional['LimitCORE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5516-
Optional['LimitRSS'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5517-
Optional['LimitNOFILE'] => Variant[Integer[-1],Pattern['^(infinity|\d+(:(infinity|\d+))?)$']],
5518-
Optional['LimitAS'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5519-
Optional['LimitNPROC'] => Variant[Integer[-1],Pattern['^(infinity|\d+(:(infinity|\d+))?)$']],
5520-
Optional['LimitMEMLOCK'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5521-
Optional['LimitLOCKS'] => Integer[1],
5522-
Optional['LimitSIGPENDING'] => Integer[1],
5523-
Optional['LimitMSGQUEUE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5524-
Optional['LimitNICE'] => Variant[Integer[0,40], Pattern['^(-\+([0-1]?[0-9]|20))|([0-3]?[0-9]|40)$']],
5525-
Optional['LimitRTPRIO'] => Integer[0],
5526-
Optional['LimitRTTIME'] => Pattern['^\d+(ms|s|m|h|d|w|M|y)?(:\d+(ms|s|m|h|d|w|M|y)?)?$'],
5527-
Optional['CPUAccounting'] => Boolean,
5528-
Optional['CPUShares'] => Integer[2,262144],
5529-
Optional['StartupCPUShares'] => Integer[2,262144],
5530-
Optional['CPUQuota'] => Optional[Pattern['^([1-9][0-9]*)%$']],
5531-
Optional['MemoryAccounting'] => Boolean,
5532-
Optional['MemoryLow'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5533-
Optional['MemoryMin'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5534-
Optional['MemoryHigh'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5535-
Optional['MemoryMax'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5536-
Optional['MemoryLimit'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5537-
Optional['MemorySwapMax'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5538-
Optional['TasksAccounting'] => Boolean,
5539-
Optional['TasksMax'] => Variant[Integer[1],Pattern['^(infinity|([1-9][0-9]?$|^100)%)$']],
5540-
Optional['IOAccounting'] => Boolean,
5541-
Optional['IOWeight'] => Integer[1,10000],
5542-
Optional['StartupIOWeight'] => Integer[1,10000],
5543-
Optional['IODeviceWeight'] => Array[Hash[Stdlib::Absolutepath, Integer[1,10000], 1, 1]],
5544-
Optional['IOReadBandwidthMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5545-
Optional['IOWriteBandwidthMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5546-
Optional['IOReadIOPSMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5547-
Optional['IOWriteIOPSMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5548-
Optional['DeviceAllow'] => String[1],
5549-
Optional['DevicePolicy'] => Enum['auto','closed','strict'],
5550-
Optional['Slice'] => String[1],
5551-
Optional['Delegate'] => Boolean,
5552-
Optional['OOMScoreAdjust'] => Integer[-1000,1000]
5553-
}]
5554-
```
5555-
55565415
### <a name="Systemd--ServiceManagerSettings"></a>`Systemd::ServiceManagerSettings`
55575416

55585417
NOTE: Systemd::SettingEnsure here allows to delete the setting from the INI

manifests/init.pp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
# @param default_target
66
# The default systemd boot target, unmanaged if set to undef.
77
#
8-
# @param service_limits
9-
# Deprecated, use dropin_files - Hash of `systemd::service_limits` resources
10-
#
118
# @param networks
129
# Hash of `systemd::network` resources
1310
#
@@ -263,7 +260,6 @@
263260
class systemd (
264261
Optional[Pattern['^.+\.target$']] $default_target = undef,
265262
Hash[String,String] $accounting = {},
266-
Stdlib::CreateResources $service_limits = {},
267263
Stdlib::CreateResources $networks = {},
268264
Stdlib::CreateResources $timers = {},
269265
Stdlib::CreateResources $tmpfiles = {},
@@ -353,11 +349,6 @@
353349
}
354350
}
355351

356-
$service_limits.each |$service_limit, $service_limit_data| {
357-
systemd::service_limits { $service_limit:
358-
* => $service_limit_data,
359-
}
360-
}
361352
$networks.each |$network, $network_data| {
362353
systemd::network { $network:
363354
* => $network_data,

manifests/service_limits.pp

Lines changed: 0 additions & 99 deletions
This file was deleted.

spec/classes/init_spec.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -473,22 +473,6 @@
473473
it { is_expected.to contain_exec('set local hardware clock to UTC time') }
474474
end
475475

476-
context 'when passing service limits' do
477-
let(:params) do
478-
{
479-
service_limits: { 'openstack-nova-compute.service' => { 'limits' => { 'LimitNOFILE' => 32_768 } } },
480-
}
481-
end
482-
483-
# systemd::service_limits is deprecated
484-
before do
485-
Puppet.settings[:strict] = :warning
486-
end
487-
488-
it { is_expected.to compile.with_all_deps }
489-
it { is_expected.to contain_systemd__service_limits('openstack-nova-compute.service').with_limits('LimitNOFILE' => 32_768) }
490-
end
491-
492476
context 'when passing networks' do
493477
let :params do
494478
{

0 commit comments

Comments
 (0)