Merge remote-tracking branch 'puppetlabs/master' into 3.0.x

Author: hunner

README.markdown

@@ -120,6 +120,10 @@ Sets the file that ntp configuration is written into.
 
 Determines which template Puppet should use for the ntp configuration.
 
+####`disable_monitor`
+
+Disables monitoring of ntp.
+
 ####`driftfile`
 
 Sets the location of the drift file for ntp.

manifests/config.pp

@@ -2,8 +2,7 @@
 class ntp::config inherits ntp {
 
   if $keys_enable {
-    # Workaround for the lack of dirname() in stdlib 3.2.
-    $directory = inline_template('<%= File.dirname(keys_file) %>')
+    $directory = dirname($keys_file)
     file { $directory:
       ensure  => directory,
       owner   => 0,

manifests/init.pp

@@ -2,6 +2,7 @@
   $autoupdate        = $ntp::params::autoupdate,
   $config            = $ntp::params::config,
   $config_template   = $ntp::params::config_template,
+  $disable_monitor   = $ntp::params::disable_monitor,
   $driftfile         = $ntp::params::driftfile,
   $keys_enable       = $ntp::params::keys_enable,
   $keys_file         = $ntp::params::keys_file,
@@ -23,6 +24,7 @@
 
   validate_absolute_path($config)
   validate_string($config_template)
+  validate_bool($disable_monitor)
   validate_absolute_path($driftfile)
   validate_bool($keys_enable)
   validate_re($keys_controlkey, ['^\d+$', ''])

manifests/params.pp

@@ -2,6 +2,7 @@
 
   $autoupdate        = false
   $config_template   = 'ntp/ntp.conf.erb'
+  $disable_monitor   = false
   $keys_enable       = false
   $keys_controlkey   = ''
   $keys_requestkey   = ''

spec/acceptance/disable_monitoring_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper_acceptance'
+
+describe "ntp class with disable_monitor:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  context 'should run successfully' do
+    pp = "class { 'ntp': disable_monitor => true }"
+
+    it 'runs twice' do
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file('/etc/ntp.conf') do
+      it { should contain('disable monitor') }
+    end
+  end
+
+  context 'should run successfully' do
+    pp = "class { 'ntp': disable_monitor => false }"
+
+    it 'runs twice' do
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file('/etc/ntp.conf') do
+      it { should_not contain('disable monitor') }
+    end
+  end
+
+end

templates/ntp.conf.erb

@@ -6,9 +6,13 @@
 tinker panic 0
 <% end -%>
 
+<% if @disable_monitor == true -%>
+disable monitor
+<% end -%>
+
 <% if @restrict != [] -%>
-# Permit time synchronization with our time source, but do not'
-# permit the source to query or modify the service on this system.'
+# Permit time synchronization with our time source, but do not
+# permit the source to query or modify the service on this system.
 <% @restrict.flatten.each do |restrict| -%>
 restrict <%= restrict %>
 <% end %>
@@ -40,4 +44,5 @@ requestkey <%= @keys_requestkey %>
 <% if @keys_controlkey != '' -%>
 controlkey <%= @keys_controlkey %>
 <% end -%>
+
 <% end -%>