Skip to content

Commit 5a6bfb7

Browse files
DavidSDavidS
committed
Move params to data-in-modules
Note that data-in-modules is currently still marked as "experimental", but will be finalized soon, supporting what is currently used here.
1 parent 428f9b1 commit 5a6bfb7

20 files changed

+266
-439
lines changed

‎data/AIX.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
ntp::driftfile: '/etc/ntp.drift'
3+
ntp::package_name:
4+
- 'bos.net.tcp.client'
5+
ntp::restrict:
6+
- 'default nomodify notrap nopeer noquery'
7+
- '127.0.0.1'
8+
ntp::service_name: 'xntpd'

‎data/Amazon.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ntp::keys_file: '/etc/ntp/keys'
2+
ntp::restrict:
3+
- 'default kod nomodify notrap nopeer noquery'
4+
- '-6 default kod nomodify notrap nopeer noquery'
5+
- '127.0.0.1'
6+
- '-6 ::1'
7+
ntp::iburst_enable: false
8+
ntp::servers:
9+
- '0.centos.pool.ntp.org'
10+
- '1.centos.pool.ntp.org'
11+
- '2.centos.pool.ntp.org'
12+
ntp::disable_monitor: false

‎data/Archlinux.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ntp::driftfile: '/var/lib/ntp/ntp.drift'
2+
ntp::restrict:
3+
- 'default kod nomodify notrap nopeer noquery'
4+
- '-6 default kod nomodify notrap nopeer noquery'
5+
- '127.0.0.1'
6+
- '-6 ::1'
7+
ntp::iburst_enable: false
8+
ntp::servers:
9+
- '0.arch.pool.ntp.org'
10+
- '1.arch.pool.ntp.org'
11+
- '2.arch.pool.ntp.org'
12+
- '3.arch.pool.ntp.org'

‎data/Debian.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ntp::restrict:
2+
- '-4 default kod nomodify notrap nopeer noquery'
3+
- '-6 default kod nomodify notrap nopeer noquery'
4+
- '127.0.0.1'
5+
- '::1'
6+
ntp::service_name: 'ntp'
7+
ntp::servers:
8+
- '0.debian.pool.ntp.org'
9+
- '1.debian.pool.ntp.org'
10+
- '2.debian.pool.ntp.org'
11+
- '3.debian.pool.ntp.org'

‎data/Fedora.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
ntp::restrict:
2+
- 'default nomodify notrap nopeer noquery'
3+
- '127.0.0.1'
4+
- '::1'
5+
ntp::servers:
6+
- '0.fedora.pool.ntp.org'
7+
- '1.fedora.pool.ntp.org'
8+
- '2.fedora.pool.ntp.org'
9+
- '3.fedora.pool.ntp.org'

‎data/FreeBSD.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
ntp::driftfile: '/var/db/ntpd.drift'
2+
ntp::package_name: ['net/ntp']
3+
ntp::restrict:
4+
- 'default kod nomodify notrap nopeer noquery'
5+
- '-6 default kod nomodify notrap nopeer noquery'
6+
- '127.0.0.1'
7+
- '-6 ::1'
8+
ntp::servers:
9+
- '0.freebsd.pool.ntp.org'
10+
- '1.freebsd.pool.ntp.org'
11+
- '2.freebsd.pool.ntp.org'
12+
- '3.freebsd.pool.ntp.org'
13+
ntp::maxpoll: 9
14+
ntp::package_manage: false

‎data/Gentoo.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ntp::package_name: [ 'net-misc/ntp' ]
2+
ntp::restrict:
3+
- 'default kod nomodify notrap nopeer noquery'
4+
- '-6 default kod nomodify notrap nopeer noquery'
5+
- '127.0.0.1'
6+
- '-6 ::1'
7+
ntp::iburst_enable: false
8+
ntp::servers:
9+
- '0.gentoo.pool.ntp.org'
10+
- '1.gentoo.pool.ntp.org'
11+
- '2.gentoo.pool.ntp.org'
12+
- '3.gentoo.pool.ntp.org'

‎data/OpenSuSE-13.2.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ntp::service_name: ntpd

‎data/RedHat.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ntp::keys_file: '/etc/ntp/keys'
2+
ntp::restrict:
3+
- 'default kod nomodify notrap nopeer noquery'
4+
- '-6 default kod nomodify notrap nopeer noquery'
5+
- '127.0.0.1'
6+
- '-6 ::1'
7+
ntp::iburst_enable: false
8+
ntp::servers:
9+
- '0.centos.pool.ntp.org'
10+
- '1.centos.pool.ntp.org'
11+
- '2.centos.pool.ntp.org'
12+
ntp::step_tickers_file: '/etc/ntp/step-tickers'

‎data/SLES-10.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ntp::package_name: [ 'xntp' ]

‎data/SLES-12.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ntp::service_provider: systemd

‎data/Solaris-11.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ntp::package_name: [ 'SUNWntpr', 'SUNWntpu' ]
2+
ntp::restrict:
3+
- 'default nomodify notrap nopeer noquery'
4+
- '127.0.0.1'

‎data/Solaris.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ntp::config: '/etc/inet/ntp.conf'
2+
ntp::driftfile: '/var/ntp/ntp.drift'
3+
ntp::keys_file: '/etc/inet/ntp.keys'
4+
ntp::package_name: [ 'service/network/ntp' ]
5+
ntp::restrict:
6+
- 'default kod nomodify notrap nopeer noquery'
7+
- '-6 default kod nomodify notrap nopeer noquery'
8+
- '127.0.0.1'
9+
- '-6 ::1'
10+
ntp::service_name: 'network/ntp'
11+
ntp::iburst_enable: false

‎data/Suse.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ntp::service_name: ntp
2+
ntp::restrict:
3+
- 'default kod nomodify notrap nopeer noquery'
4+
- '-6 default kod nomodify notrap nopeer noquery'
5+
- '127.0.0.1'
6+
- '-6 ::1'
7+
ntp::servers:
8+
- '0.opensuse.pool.ntp.org'
9+
- '1.opensuse.pool.ntp.org'
10+
- '2.opensuse.pool.ntp.org'
11+
- '3.opensuse.pool.ntp.org'

‎data/common.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
ntp::authprov: ~
3+
ntp::autoupdate: false
4+
ntp::broadcastclient: false
5+
ntp::config_dir: ~
6+
ntp::config_file_mode: '0644'
7+
ntp::config_template: 'ntp/ntp.conf.erb'
8+
ntp::config: '/etc/ntp.conf'
9+
ntp::disable_auth: false
10+
ntp::disable_dhclient: false
11+
ntp::disable_kernel: false
12+
ntp::disable_monitor: true
13+
ntp::driftfile: '/var/lib/ntp/drift'
14+
ntp::fudge: []
15+
ntp::iburst_enable: true
16+
ntp::interfaces_ignore: []
17+
ntp::interfaces: []
18+
ntp::keys_controlkey: ''
19+
ntp::keys_enable: false
20+
ntp::keys_file: '/etc/ntp.keys'
21+
ntp::keys_requestkey: ''
22+
ntp::keys_trusted: []
23+
ntp::keys: []
24+
ntp::leapfile: ~
25+
ntp::logfile: ~
26+
ntp::ntpsigndsocket: ~
27+
ntp::maxpoll: ~
28+
ntp::minpoll: ~
29+
ntp::package_ensure: present
30+
ntp::package_manage: true
31+
ntp::package_name: [ 'ntp' ]
32+
ntp::panic: ~
33+
ntp::peers: []
34+
ntp::preferred_servers: []
35+
ntp::servers:
36+
- '0.pool.ntp.org'
37+
- '1.pool.ntp.org'
38+
- '2.pool.ntp.org'
39+
- '3.pool.ntp.org'
40+
ntp::service_enable: true
41+
ntp::service_ensure: running
42+
ntp::service_manage: true
43+
ntp::service_name: ntpd
44+
ntp::service_provider: ~
45+
ntp::stepout: ~
46+
ntp::step_tickers_file: ~
47+
ntp::step_tickers_template: 'ntp/step-tickers.erb'
48+
ntp::tinker: ~
49+
ntp::tos_ceiling: '15'
50+
ntp::tos_cohort: '0'
51+
ntp::tos_floor: '1'
52+
ntp::tos_minclock: '3'
53+
ntp::tos_minsane: '1'
54+
ntp::tos: false
55+
ntp::udlc_stratum: '10'
56+
ntp::udlc: false

‎hiera.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
version: 4
3+
datadir: data
4+
hierarchy:
5+
- name: "Full Version"
6+
backend: yaml
7+
path: "%{facts.os.name}-%{facts.os.release.full}"
8+
9+
- name: "Major Version"
10+
backend: yaml
11+
path: "%{facts.os.name}-%{facts.os.release.major}"
12+
13+
- name: "Distribution Name"
14+
backend: yaml
15+
path: "%{facts.os.name}"
16+
17+
- name: "Operating System Family"
18+
backend: yaml
19+
path: "%{facts.os.family}"
20+
21+
- name: "common"
22+
backend: yaml

‎manifests/init.pp

+66-55
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
class ntp (
2-
$autoupdate = $ntp::params::autoupdate,
3-
$broadcastclient = $ntp::params::broadcastclient,
4-
$config = $ntp::params::config,
5-
$config_dir = $ntp::params::config_dir,
6-
$config_file_mode = $ntp::params::config_file_mode,
7-
$config_template = $ntp::params::config_template,
8-
$disable_auth = $ntp::params::disable_auth,
9-
$disable_dhclient = $ntp::params::disable_dhclient,
10-
$disable_kernel = $ntp::params::disable_kernel,
11-
$disable_monitor = $ntp::params::disable_monitor,
12-
$fudge = $ntp::params::fudge,
13-
$driftfile = $ntp::params::driftfile,
14-
$leapfile = $ntp::params::leapfile,
15-
$logfile = $ntp::params::logfile,
16-
$iburst_enable = $ntp::params::iburst_enable,
17-
$keys = $ntp::params::keys,
18-
$keys_enable = $ntp::params::keys_enable,
19-
$keys_file = $ntp::params::keys_file,
20-
$keys_controlkey = $ntp::params::keys_controlkey,
21-
$keys_requestkey = $ntp::params::keys_requestkey,
22-
$keys_trusted = $ntp::params::keys_trusted,
23-
$minpoll = $ntp::params::minpoll,
24-
$maxpoll = $ntp::params::maxpoll,
25-
$package_ensure = $ntp::params::package_ensure,
26-
$package_manage = $ntp::params::package_manage,
27-
$package_name = $ntp::params::package_name,
28-
$panic = $ntp::params::panic,
29-
$peers = $ntp::params::peers,
30-
$preferred_servers = $ntp::params::preferred_servers,
31-
$restrict = $ntp::params::restrict,
32-
$interfaces = $ntp::params::interfaces,
33-
$interfaces_ignore = $ntp::params::interfaces_ignore,
34-
$servers = $ntp::params::servers,
35-
$service_enable = $ntp::params::service_enable,
36-
$service_ensure = $ntp::params::service_ensure,
37-
$service_manage = $ntp::params::service_manage,
38-
$service_name = $ntp::params::service_name,
39-
$service_provider = $ntp::params::service_provider,
40-
$stepout = $ntp::params::stepout,
41-
$step_tickers_file = $ntp::params::step_tickers_file,
42-
$step_tickers_template = $ntp::params::step_tickers_template,
43-
$tinker = $ntp::params::tinker,
44-
$tos = $ntp::params::tos,
45-
$tos_minclock = $ntp::params::tos_minclock,
46-
$tos_minsane = $ntp::params::tos_minsane,
47-
$tos_floor = $ntp::params::tos_floor,
48-
$tos_ceiling = $ntp::params::tos_ceiling,
49-
$tos_cohort = $ntp::params::tos_cohort,
50-
$udlc = $ntp::params::udlc,
51-
$udlc_stratum = $ntp::params::udlc_stratum,
52-
$ntpsigndsocket = $ntp::params::ntpsigndsocket,
53-
$authprov = $ntp::params::authprov,
54-
) inherits ntp::params {
2+
$autoupdate,
3+
$broadcastclient,
4+
$config,
5+
$config_dir,
6+
$config_file_mode,
7+
$config_template,
8+
$disable_auth,
9+
$disable_dhclient,
10+
$disable_kernel,
11+
$disable_monitor,
12+
$fudge,
13+
$driftfile,
14+
$leapfile,
15+
$logfile,
16+
$iburst_enable,
17+
$keys,
18+
$keys_enable,
19+
$keys_file,
20+
$keys_controlkey,
21+
$keys_requestkey,
22+
$keys_trusted,
23+
$minpoll,
24+
$maxpoll,
25+
$package_ensure,
26+
$package_manage,
27+
$package_name,
28+
$panic,
29+
$peers,
30+
$preferred_servers,
31+
$restrict,
32+
$interfaces,
33+
$interfaces_ignore,
34+
$servers,
35+
$service_enable,
36+
$service_ensure,
37+
$service_manage,
38+
$service_name,
39+
$service_provider,
40+
$stepout,
41+
$step_tickers_file,
42+
$step_tickers_template,
43+
$tinker,
44+
$tos,
45+
$tos_minclock,
46+
$tos_minsane,
47+
$tos_floor,
48+
$tos_ceiling,
49+
$tos_cohort,
50+
$udlc,
51+
$udlc_stratum,
52+
$ntpsigndsocket,
53+
$authprov,
54+
) {
5555

5656
validate_bool($broadcastclient)
5757
validate_absolute_path($config)
@@ -75,7 +75,6 @@
7575
validate_string($package_ensure)
7676
validate_bool($package_manage)
7777
validate_array($package_name)
78-
if $panic { validate_numeric($panic, 65535, 0) }
7978
validate_array($preferred_servers)
8079
validate_array($restrict)
8180
validate_array($interfaces)
@@ -90,7 +89,6 @@
9089
validate_string($step_tickers_file)
9190
validate_string($step_tickers_template)
9291
}
93-
validate_bool($tinker)
9492
validate_bool($tos)
9593
if $tos_minclock { validate_numeric($tos_minclock) }
9694
if $tos_minsane { validate_numeric($tos_minsane) }
@@ -109,6 +107,19 @@
109107
notice('ntp: autoupdate parameter has been deprecated and replaced with package_ensure. Set package_ensure to latest for the same behavior as autoupdate => true.')
110108
}
111109

110+
# defaults for tinker and panic are different, when running on virtual machines
111+
if str2bool($::is_virtual) {
112+
$_tinker = pick($tinker, true)
113+
$_panic = pick($panic, 0)
114+
} else {
115+
$_tinker = pick($tinker, false)
116+
$_panic = $panic
117+
}
118+
119+
validate_bool($_tinker)
120+
if $_panic != undef { validate_numeric($_panic, 65535, 0) }
121+
122+
112123
# Anchor this as per #8040 - this ensures that classes won't float off and
113124
# mess everything up. You can read about this at:
114125
# http://docs.puppetlabs.com/puppet/2.7/reference/lang_containment.html#known-issues

0 commit comments

Comments
 (0)