Skip to content

Commit 58aac77

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

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
@@ -161,7 +160,6 @@
161160
* [`Systemd::MachineInfoSettings`](#Systemd--MachineInfoSettings): Matches Systemd machine-info (hostnamectl) file Struct
162161
* [`Systemd::OomdSettings`](#Systemd--OomdSettings): Configurations for oomd.conf
163162
* [`Systemd::Output`](#Systemd--Output): Defines allowed output values
164-
* [`Systemd::ServiceLimits`](#Systemd--ServiceLimits): Deprecated - Matches Systemd Service Limit Struct
165163
* [`Systemd::ServiceManagerSettings`](#Systemd--ServiceManagerSettings): Matches Systemd system.conf/user.conf settings
166164
* [`Systemd::SettingEnsure`](#Systemd--SettingEnsure): Defines allowed ensure states for an ini_setting
167165
* [`Systemd::Timespan`](#Systemd--Timespan): Defines a timespan type
@@ -196,7 +194,6 @@ This module allows triggering systemd commands once for all modules
196194
The following parameters are available in the `systemd` class:
197195

198196
* [`default_target`](#-systemd--default_target)
199-
* [`service_limits`](#-systemd--service_limits)
200197
* [`networks`](#-systemd--networks)
201198
* [`timers`](#-systemd--timers)
202199
* [`tmpfiles`](#-systemd--tmpfiles)
@@ -278,14 +275,6 @@ The default systemd boot target, unmanaged if set to undef.
278275

279276
Default value: `undef`
280277

281-
##### <a name="-systemd--service_limits"></a>`service_limits`
282-
283-
Data type: `Stdlib::CreateResources`
284-
285-
Deprecated, use dropin_files - Hash of `systemd::service_limits` resources
286-
287-
Default value: `{}`
288-
289278
##### <a name="-systemd--networks"></a>`networks`
290279

291280
Data type: `Stdlib::CreateResources`
@@ -2065,83 +2054,6 @@ The structure is equal to the 'network' parameter of an interface.
20652054

20662055
Default value: `{}`
20672056

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

21472059
Create a timer and optionally a service unit to execute with the timer unit
@@ -5432,59 +5344,6 @@ Used in DefaultStandardOutput/DefaultStandardError e.g.
54325344

54335345
Alias of `Enum['inherit', 'null', 'tty', 'journal', 'journal+console', 'kmsg', 'kmsg+console']`
54345346

5435-
### <a name="Systemd--ServiceLimits"></a>`Systemd::ServiceLimits`
5436-
5437-
Deprecated - Matches Systemd Service Limit Struct
5438-
5439-
Alias of
5440-
5441-
```puppet
5442-
Struct[{
5443-
Optional['LimitCPU'] => Pattern['^\d+(s|m|h|d|w|M|y)?(:\d+(s|m|h|d|w|M|y)?)?$'],
5444-
Optional['LimitFSIZE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5445-
Optional['LimitDATA'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5446-
Optional['LimitSTACK'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5447-
Optional['LimitCORE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5448-
Optional['LimitRSS'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5449-
Optional['LimitNOFILE'] => Variant[Integer[-1],Pattern['^(infinity|\d+(:(infinity|\d+))?)$']],
5450-
Optional['LimitAS'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5451-
Optional['LimitNPROC'] => Variant[Integer[-1],Pattern['^(infinity|\d+(:(infinity|\d+))?)$']],
5452-
Optional['LimitMEMLOCK'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5453-
Optional['LimitLOCKS'] => Integer[1],
5454-
Optional['LimitSIGPENDING'] => Integer[1],
5455-
Optional['LimitMSGQUEUE'] => Pattern['^(infinity|((\d+(K|M|G|T|P|E)?(:\d+(K|M|G|T|P|E)?)?)))$'],
5456-
Optional['LimitNICE'] => Variant[Integer[0,40], Pattern['^(-\+([0-1]?[0-9]|20))|([0-3]?[0-9]|40)$']],
5457-
Optional['LimitRTPRIO'] => Integer[0],
5458-
Optional['LimitRTTIME'] => Pattern['^\d+(ms|s|m|h|d|w|M|y)?(:\d+(ms|s|m|h|d|w|M|y)?)?$'],
5459-
Optional['CPUAccounting'] => Boolean,
5460-
Optional['CPUShares'] => Integer[2,262144],
5461-
Optional['StartupCPUShares'] => Integer[2,262144],
5462-
Optional['CPUQuota'] => Optional[Pattern['^([1-9][0-9]*)%$']],
5463-
Optional['MemoryAccounting'] => Boolean,
5464-
Optional['MemoryLow'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5465-
Optional['MemoryMin'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5466-
Optional['MemoryHigh'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5467-
Optional['MemoryMax'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5468-
Optional['MemoryLimit'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5469-
Optional['MemorySwapMax'] => Pattern['\A(infinity|\d+(K|M|G|T|%)?(:\d+(K|M|G|T|%)?)?)\z'],
5470-
Optional['TasksAccounting'] => Boolean,
5471-
Optional['TasksMax'] => Variant[Integer[1],Pattern['^(infinity|([1-9][0-9]?$|^100)%)$']],
5472-
Optional['IOAccounting'] => Boolean,
5473-
Optional['IOWeight'] => Integer[1,10000],
5474-
Optional['StartupIOWeight'] => Integer[1,10000],
5475-
Optional['IODeviceWeight'] => Array[Hash[Stdlib::Absolutepath, Integer[1,10000], 1, 1]],
5476-
Optional['IOReadBandwidthMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5477-
Optional['IOWriteBandwidthMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5478-
Optional['IOReadIOPSMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5479-
Optional['IOWriteIOPSMax'] => Array[Hash[Stdlib::Absolutepath, Pattern['^(\d+(K|M|G|T)?)$'], 1, 1]],
5480-
Optional['DeviceAllow'] => String[1],
5481-
Optional['DevicePolicy'] => Enum['auto','closed','strict'],
5482-
Optional['Slice'] => String[1],
5483-
Optional['Delegate'] => Boolean,
5484-
Optional['OOMScoreAdjust'] => Integer[-1000,1000]
5485-
}]
5486-
```
5487-
54885347
### <a name="Systemd--ServiceManagerSettings"></a>`Systemd::ServiceManagerSettings`
54895348

54905349
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
#
@@ -259,7 +256,6 @@
259256
class systemd (
260257
Optional[Pattern['^.+\.target$']] $default_target = undef,
261258
Hash[String,String] $accounting = {},
262-
Stdlib::CreateResources $service_limits = {},
263259
Stdlib::CreateResources $networks = {},
264260
Stdlib::CreateResources $timers = {},
265261
Stdlib::CreateResources $tmpfiles = {},
@@ -348,11 +344,6 @@
348344
}
349345
}
350346

351-
$service_limits.each |$service_limit, $service_limit_data| {
352-
systemd::service_limits { $service_limit:
353-
* => $service_limit_data,
354-
}
355-
}
356347
$networks.each |$network, $network_data| {
357348
systemd::network { $network:
358349
* => $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
@@ -472,22 +472,6 @@
472472
it { is_expected.to contain_exec('set local hardware clock to UTC time') }
473473
end
474474

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

0 commit comments

Comments
 (0)