Add preferred_servers feature.

This adds:

`preferred_servers` [Array]: The servers to prefer.

As requested by Erik Dalén!

3 files changed, 44 insertions, 40 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index 45279be..e5dd5ae 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,15 +1,16 @@
 class ntp::config (
-  $config          = $ntp::config,
-  $config_template = $ntp::config_template,
-  $driftfile       = $ntp::driftfile,
-  $keys_enable     = $ntp::keys_enable,
-  $keys_file       = $ntp::keys_file,
-  $keys_controlkey = $ntp::keys_controlkey,
-  $keys_requestkey = $ntp::keys_requestkey,
-  $keys_trusted    = $ntp::keys_trusted,
-  $panic           = $ntp::panic,
-  $restrict        = $ntp::restrict,
-  $servers         = $ntp::servers,
+  $config            = $ntp::config,
+  $config_template   = $ntp::config_template,
+  $driftfile         = $ntp::driftfile,
+  $keys_enable       = $ntp::keys_enable,
+  $keys_file         = $ntp::keys_file,
+  $keys_controlkey   = $ntp::keys_controlkey,
+  $keys_requestkey   = $ntp::keys_requestkey,
+  $keys_trusted      = $ntp::keys_trusted,
+  $panic             = $ntp::panic,
+  $preferred_servers = $ntp::preferred_servers,
+  $restrict          = $ntp::restrict,
+  $servers           = $ntp::servers,
 ) inherits ntp {
 
   if $keys_enable {
diff --git a/manifests/init.pp b/manifests/init.pp
index d406fb3..2c8b9e4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,22 +1,23 @@
 class ntp (
-  $autoupdate      = $ntp::params::autoupdate,
-  $config          = $ntp::params::config,
-  $config_template = $ntp::params::config_template,
-  $driftfile       = $ntp::params::driftfile,
-  $keys_enable     = $ntp::params::keys_enable,
-  $keys_file       = $ntp::params::keys_file,
-  $keys_controlkey = $ntp::params::keys_controlkey,
-  $keys_requestkey = $ntp::params::keys_requestkey,
-  $keys_trusted    = $ntp::params::keys_trusted,
-  $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,
-  $service_ensure  = $ntp::params::service_ensure,
-  $service_manage  = $ntp::params::service_manage,
-  $service_name    = $ntp::params::service_name,
+  $autoupdate        = $ntp::params::autoupdate,
+  $config            = $ntp::params::config,
+  $config_template   = $ntp::params::config_template,
+  $driftfile         = $ntp::params::driftfile,
+  $keys_enable       = $ntp::params::keys_enable,
+  $keys_file         = $ntp::params::keys_file,
+  $keys_controlkey   = $ntp::params::keys_controlkey,
+  $keys_requestkey   = $ntp::params::keys_requestkey,
+  $keys_trusted      = $ntp::params::keys_trusted,
+  $package_ensure    = $ntp::params::package_ensure,
+  $package_name      = $ntp::params::package_name,
+  $panic             = $ntp::params::panic,
+  $preferred_servers = $ntp::params::preferred_servers,
+  $restrict          = $ntp::params::restrict,
+  $servers           = $ntp::params::servers,
+  $service_enable    = $ntp::params::service_enable,
+  $service_ensure    = $ntp::params::service_ensure,
+  $service_manage    = $ntp::params::service_manage,
+  $service_name      = $ntp::params::service_name,
 ) inherits ntp::params {
 
   validate_absolute_path($config)
@@ -29,6 +30,7 @@ class ntp (
   validate_string($package_ensure)
   validate_array($package_name)
   validate_bool($panic)
+  validate_array($preferred_servers)
   validate_bool($restrict)
   validate_array($servers)
   validate_bool($service_enable)
diff --git a/manifests/params.pp b/manifests/params.pp
index 9e91cce..ef037fc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,16 +1,17 @@
 class ntp::params {
 
-  $autoupdate      = false
-  $config_template = 'ntp/ntp.conf.erb'
-  $keys_enable     = false
-  $keys_controlkey = ''
-  $keys_requestkey = ''
-  $keys_trusted    = []
-  $package_ensure  = 'present'
-  $restrict        = true
-  $service_enable  = true
-  $service_ensure  = 'running'
-  $service_manage  = true
+  $autoupdate        = false
+  $config_template   = 'ntp/ntp.conf.erb'
+  $keys_enable       = false
+  $keys_controlkey   = ''
+  $keys_requestkey   = ''
+  $keys_trusted      = []
+  $package_ensure    = 'present'
+  $preferred_servers = []
+  $restrict          = true
+  $service_enable    = true
+  $service_ensure    = 'running'
+  $service_manage    = true
 
   # On virtual machines allow large clock skews.
   $panic = str2bool($::is_virtual) ? {