From ac94e1922a7b0c8d4d351a12a369951d14d701e7 Mon Sep 17 00:00:00 2001 From: hhasenbein Date: Wed, 14 Mar 2018 17:53:06 +0100 Subject: [PATCH 1/3] added tos_orphan parameter --- README.md | 10 ++++++++++ data/common.yaml | 1 + manifests/init.pp | 5 +++++ templates/ntp.conf.epp | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/README.md b/README.md index 70709930..8d76b95c 100644 --- a/README.md +++ b/README.md @@ -635,6 +635,16 @@ Specifies the cohort tos option. Valid options: 0 or 1. Default value: 0. +#### `tos_orphan` + +Optional. + +Data type: Integer[1]. + +Enables orphan mode at stated stratum level. The recommended value for tos\_orphan is 2 more than the worst-case externally-reachable source of time. +Participing ntpd instances must be in a mesh with each others (e.g. peers). +[ntp.org](http://support.ntp.org/bin/view/Support/OrphanMode) + #### `tinker` Data type: Boolean. diff --git a/data/common.yaml b/data/common.yaml index c2b66737..d9feb4e2 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -59,6 +59,7 @@ ntp::tos_floor: 1 ntp::tos_maxclock: 6 ntp::tos_minclock: 3 ntp::tos_minsane: 1 +ntp::tos_orphan: 6 ntp::tos: false ntp::udlc_stratum: 10 ntp::udlc: false diff --git a/manifests/init.pp b/manifests/init.pp index 5acc9b39..39f13f10 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -109,6 +109,10 @@ # @param peers # List of NTP servers with which to synchronise the local clock. # +# @param tos_orphan +# Enables Orphan mode for peer group +# Value: Should be set to 2 more than the worst-case externally-reachable source's stratum. +# # @param pool # List of NTP server pools with which to synchronise the local clock. # @@ -255,6 +259,7 @@ Optional[Integer[1]] $tos_minsane, Optional[Integer[1]] $tos_floor, Optional[Integer[1]] $tos_ceiling, + Optional[Integer[1]] $tos_orphan, Variant[Boolean, Integer[0,1]] $tos_cohort, Boolean $udlc, Optional[Integer[1,15]] $udlc_stratum, diff --git a/templates/ntp.conf.epp b/templates/ntp.conf.epp index 697ed69f..ccd93a5a 100644 --- a/templates/ntp.conf.epp +++ b/templates/ntp.conf.epp @@ -101,6 +101,10 @@ ntpsigndsocket <%= $ntp::ntpsigndsocket %> <% $ntp::peers.each |$peer| {-%> peer <%= $peer %> <% } -%> +# Enable peer group orphan mode? +<% if $ntp::tos_orphan {-%> +tos orphan <%= $ntp::tos_orphan %> +<% } -%> <% } -%> <% unless $ntp::pool.empty {-%> From ef20c0e29ca9baa662e976d273f18a8f6b934ad5 Mon Sep 17 00:00:00 2001 From: Hendrik Hasenbein Date: Thu, 22 Mar 2018 15:29:43 +0100 Subject: [PATCH 2/3] Update ntp.conf.epp Moved comment into conditional statement. --- templates/ntp.conf.epp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ntp.conf.epp b/templates/ntp.conf.epp index ccd93a5a..e52829a7 100644 --- a/templates/ntp.conf.epp +++ b/templates/ntp.conf.epp @@ -101,8 +101,8 @@ ntpsigndsocket <%= $ntp::ntpsigndsocket %> <% $ntp::peers.each |$peer| {-%> peer <%= $peer %> <% } -%> -# Enable peer group orphan mode? <% if $ntp::tos_orphan {-%> +# Enable peer group orphan mode tos orphan <%= $ntp::tos_orphan %> <% } -%> <% } -%> From fe3b2e98f23ab716aa169062bd1d6f9b256026cd Mon Sep 17 00:00:00 2001 From: Hendrik Hasenbein Date: Mon, 26 Mar 2018 15:10:12 +0200 Subject: [PATCH 3/3] Update common.yaml removed default orphan stratum for peer groups --- data/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/common.yaml b/data/common.yaml index d9feb4e2..afd5ca69 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -59,7 +59,7 @@ ntp::tos_floor: 1 ntp::tos_maxclock: 6 ntp::tos_minclock: 3 ntp::tos_minsane: 1 -ntp::tos_orphan: 6 +ntp::tos_orphan: ~ ntp::tos: false ntp::udlc_stratum: 10 ntp::udlc: false