summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2013-07-09 16:59:43 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2013-07-09 17:01:04 -0400
commit5fd66d38ed79bb42c64ff68f26a43e71207476ef (patch)
treed313c8dba66ca14de0928340b8ab652e42f39b7a /manifests
parent43b484c7ab6f92c9eae165982ba127e3d3a87a2e (diff)
Add panic as a new parameter in case people want to allow clock skews.
Diffstat (limited to 'manifests')
-rw-r--r--manifests/config.pp1
-rw-r--r--manifests/init.pp1
-rw-r--r--manifests/params.pp6
3 files changed, 8 insertions, 0 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 80368f0..b34ef4f 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,6 +1,7 @@
class ntp::config(
$config = $ntp::config,
$config_template = $ntp::config_template,
+ $panic = $ntp::panic,
$restrict = $ntp::restrict,
$servers = $ntp::servers,
) inherits ntp {
diff --git a/manifests/init.pp b/manifests/init.pp
index 2dd9184..6d594c3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,6 +4,7 @@ class ntp(
$config_template = $ntp::params::config_template,
$package_ensure = $ntp::params::package_ensure,
$package_name = $ntp::params::package_name,
+ $panic = $ntp::params::panic,
$restrict = $ntp::params::restrict,
$servers = $ntp::params::servers,
$service_enable = $ntp::params::service_enable,
diff --git a/manifests/params.pp b/manifests/params.pp
index 7903176..3486f6f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,6 +7,12 @@ class ntp::params() {
$service_ensure = 'running'
$service_manage = true
+ # On virtual machines allow large clock skews.
+ $panic = $::is_virtual ? {
+ true => false,
+ default => true,
+ }
+
case $::osfamily {
'Debian': {
$config = '/etc/ntp.conf'