Skip to content

Commit 74bfe64

Browse files
authored
Merge pull request #567 from voxpupuli/modulesync
modulesync 10.1.0-26-ga82038c
2 parents cd2a685 + 39e1f59 commit 74bfe64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1865
-1829
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.1.0'
5+
modulesync_config_version: '10.2.0'

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 11.0', :require => false
7+
gem 'voxpupuli-test', '~> 12.0', :require => false
88
gem 'puppet_metadata', '~> 5.0', :require => false
99
end
1010

REFERENCE.md

Lines changed: 902 additions & 901 deletions
Large diffs are not rendered by default.

manifests/dropin_file.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@
4949
$full_filename = "${path}/${unit}.d/${filename}"
5050

5151
if $ensure != 'absent' {
52-
ensure_resource('file', dirname($full_filename), {
52+
ensure_resource('file', dirname($full_filename),
53+
{
5354
ensure => directory,
5455
owner => 'root',
5556
group => 'root',
5657
recurse => $systemd::purge_dropin_dirs,
5758
purge => $systemd::purge_dropin_dirs,
5859
selinux_ignore_defaults => $selinux_ignore_defaults,
59-
})
60+
},
61+
)
6062
}
6163

6264
file { $full_filename:

manifests/manage_dropin.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
show_diff => $show_diff,
150150
notify_service => $notify_service,
151151
daemon_reload => $daemon_reload,
152-
content => epp('systemd/unit_file.epp', {
152+
content => epp('systemd/unit_file.epp',
153+
{
153154
'unit_entry' => $unit_entry,
154155
'slice_entry' => $slice_entry,
155156
'service_entry' => $service_entry,
@@ -159,6 +160,7 @@
159160
'socket_entry' => $socket_entry,
160161
'mount_entry' => $mount_entry,
161162
'swap_entry' => $swap_entry,
162-
}),
163+
},
164+
),
163165
}
164166
}

manifests/manage_unit.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@
222222
service_parameters => $service_parameters,
223223
daemon_reload => $daemon_reload,
224224
service_restart => $service_restart,
225-
content => epp('systemd/unit_file.epp', {
225+
content => epp('systemd/unit_file.epp',
226+
{
226227
'unit_entry' => $unit_entry,
227228
'slice_entry' => $slice_entry,
228229
'service_entry' => $service_entry,
@@ -232,6 +233,7 @@
232233
'socket_entry' => $socket_entry,
233234
'mount_entry' => $mount_entry,
234235
'swap_entry' => $swap_entry,
235-
}),
236+
},
237+
),
236238
}
237239
}

manifests/networkd/interface.pp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#
8888
# Creates a dummy interface, on the file system, two files
8989
# are created therefore.
90-
#
90+
#
9191
define systemd::networkd::interface (
9292
Systemd::Interface $interface,
9393
Stdlib::Absolutepath $path = '/etc/systemd/network',
@@ -107,28 +107,34 @@
107107
if 'link' in $interface.keys() {
108108
systemd::network { "${_filename}.link":
109109
path => $path,
110-
content => epp('systemd/network.epp', {
110+
content => epp('systemd/network.epp',
111+
{
111112
fname => "${_filename}.link",
112113
config => deep_merge($link_profile, $interface['link']),
113-
}),
114+
},
115+
),
114116
}
115117
}
116118
if 'netdev' in $interface.keys() {
117119
systemd::network { "${_filename}.netdev":
118120
path => $path,
119-
content => epp('systemd/network.epp', {
121+
content => epp('systemd/network.epp',
122+
{
120123
fname => "${_filename}.netdev",
121124
config => deep_merge($netdev_profile, $interface['netdev']),
122-
}),
125+
},
126+
),
123127
}
124128
}
125129
if 'network' in $interface.keys() {
126130
systemd::network { "${_filename}.network":
127131
path => $path,
128-
content => epp('systemd/network.epp', {
132+
content => epp('systemd/network.epp',
133+
{
129134
fname => "${_filename}.network",
130135
config => deep_merge($network_profile, $interface['network']),
131-
}),
136+
},
137+
),
132138
}
133139
}
134140
}

manifests/udevd.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
owner => 'root',
2121
group => 'root',
2222
mode => '0444',
23-
content => epp("${module_name}/udev_conf.epp", {
23+
content => epp("${module_name}/udev_conf.epp",
24+
{
2425
'udev_log' => $systemd::udev_log,
2526
'udev_children_max' => $systemd::udev_children_max,
2627
'udev_exec_delay' => $systemd::udev_exec_delay,
2728
'udev_event_timeout' => $systemd::udev_event_timeout,
2829
'udev_resolve_names' => $systemd::udev_resolve_names,
2930
'udev_timeout_signal' => $systemd::udev_timeout_signal,
30-
}),
31+
},
32+
),
3133
notify => Service['systemd-udevd'],
3234
}
3335

types/interface.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# network interface definition
2-
type Systemd::Interface = Struct[{
2+
type Systemd::Interface = Struct[
3+
{
34
filename => Optional[String[1]],
45
network => Optional[Systemd::Interface::Network],
56
netdev => Optional[Systemd::Interface::Netdev],
67
link => Optional[Systemd::Interface::Link],
7-
}]
8+
}
9+
]

types/interface/link.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# @summary Network device configuration(Link)
22
# @see https://www.freedesktop.org/software/systemd/man/latest/systemd.link.html
33
type Systemd::Interface::Link = Struct[{
4-
'Match' => Optional[Systemd::Interface::Link::Match],
5-
'Link' => Optional[Systemd::Interface::Link::Link],
6-
'SR-IOV' => Optional[Systemd::Interface::Link::Sr_iov],
4+
'Match' => Optional[Systemd::Interface::Link::Match],
5+
'Link' => Optional[Systemd::Interface::Link::Link],
6+
'SR-IOV' => Optional[Systemd::Interface::Link::Sr_iov],
77
}]

0 commit comments

Comments
 (0)