From 30154ed6385281488af62fee6755f3b2c4d86741 Mon Sep 17 00:00:00 2001
From: Mike Fedosin <mfedosin@redhat.com>
Date: Wed, 27 Dec 2017 16:06:27 +0100
Subject: [PATCH] Add MinPoll and MaxPoll options to NTP module

These options specify the minimum and maximum poll intervals
for NTP messages, in seconds to the power of two.

The maximum poll interval defaults to 10 (1,024 s), but can be
increased by the MaxPoll option to an upper limit of 17 (36.4 h).
The minimum poll interval defaults to 6 (64 s), but can be decreased
by the MinPoll option to a lower limit of 4 (16 s).

Change-Id: Ib2929be86e8cb31c00d166abe750354188302415
Closes-bug: #1736170
---
 puppet/services/time/ntp.yaml                 | 20 +++++++++++++++++++
 .../ntp-poll-options-3019fe517e012300.yaml    | 10 ++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 releasenotes/notes/ntp-poll-options-3019fe517e012300.yaml

diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml
index 2b65793e6a..8a291950ef 100644
--- a/puppet/services/time/ntp.yaml
+++ b/puppet/services/time/ntp.yaml
@@ -46,6 +46,24 @@ parameters:
                  ntp will send a burst of eight packages instead of one. This
                  is designed to speed up the initial syncrhonization.
     type: boolean
+  MaxPoll:
+    description: Specify maximum poll interval of upstream servers for NTP
+                 messages, in seconds to the power of two.
+                 The maximum poll interval defaults to 10 (1,024 s).
+                 Allowed values are 4 to 17.
+    type: number
+    default: 10
+    constraints:
+      - range: { min: 4, max: 17 }
+  MinPoll:
+    description: Specify minimum poll interval of upstream servers for NTP
+                 messages, in seconds to the power of two.
+                 The minimum poll interval defaults to 6 (64 s).
+                 Allowed values are 4 to 17.
+    type: number
+    default: 6
+    constraints:
+      - range: { min: 4, max: 17 }
 
 
 outputs:
@@ -56,6 +74,8 @@ outputs:
       config_settings:
         ntp::servers: {get_param: NtpServer}
         ntp::iburst_enable: {get_param: NtpIburstEnable}
+        ntp::maxpoll:: {get_param: MaxPoll}
+        ntp::minpoll:: {get_param: MinPoll}
         tripleo.ntp.firewall_rules:
           '105 ntp':
             dport: 123
diff --git a/releasenotes/notes/ntp-poll-options-3019fe517e012300.yaml b/releasenotes/notes/ntp-poll-options-3019fe517e012300.yaml
new file mode 100644
index 0000000000..db2f6dbe84
--- /dev/null
+++ b/releasenotes/notes/ntp-poll-options-3019fe517e012300.yaml
@@ -0,0 +1,10 @@
+---
+features:
+  - |
+    Add MinPoll and MaxPoll options to NTP module. These options specify
+    the minimum and maximum poll intervals for NTP messages, in seconds
+    to the power of two.
+    The maximum poll interval defaults to 10 (1,024 s), but can be
+    increased by the MaxPoll option to an upper limit of 17 (36.4 h).
+    The minimum poll interval defaults to 6 (64 s), but can be decreased
+    by the MinPoll option to a lower limit of 4 (16 s).