Skip to content

Commit

Permalink
allow string+array for ntp values
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Oct 4, 2017
1 parent d5bf0e8 commit 9adca8a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@ class{'::systemd':
}
```

This requires puppetlabs-inifile, which is only a soft dependency in this module (you need to explicitly install it).
This requires puppetlabs-inifile, which is only a soft dependency in this module (you need to explicitly install it). Both parameters accept a string or an array.
18 changes: 14 additions & 4 deletions manifests/timesyncd.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# systemd-networkd take precedence over this setting. requires puppetlabs-inifile
class systemd::timesyncd (
Enum['stopped','running'] $ensure = $systemd::timesyncd_ensure,
Optional[String] $ntp_server = $systemd::ntp_server,
Optional[String] $fallback_ntp_server = $systemd::fallback_ntp_server,
Optional[Variant[Array,String]] $ntp_server = $systemd::ntp_server,
Optional[Variant[Array,String]] $fallback_ntp_server = $systemd::fallback_ntp_server,
){

assert_private()
Expand All @@ -33,9 +33,14 @@
}

if $ntp_server {
if $ntp_server =~ String {
$_ntp_server = $ntp_server
} else {
$_ntp_server = join($ntp_server, ',')
}
ini_setting{'ntp_server':
ensure => 'present',
value => $ntp_server,
value => $_ntp_server,
setting => 'NTP',
section => 'Time',
path => '/etc/systemd/timesyncd.conf',
Expand All @@ -44,9 +49,14 @@
}

if $fallback_ntp_server {
if $fallback_ntp_server =~ String {
$_fallback_ntp_server = $fallback_ntp_server
} else {
$_fallback_ntp_server = join($fallback_ntp_server, ',')
}
ini_setting{'fallback_ntp_server':
ensure => 'present',
value => $fallback_ntp_server,
value => $_fallback_ntp_server,
setting => 'FallbackNTP',
section => 'Time',
path => '/etc/systemd/timesyncd.conf',
Expand Down

0 comments on commit 9adca8a

Please sign in to comment.