Rename parameters, remove outdated documentation, and adds inherit to

ntp on the child classes.

5 files changed, 21 insertions, 68 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index 3295548..80368f0 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -3,7 +3,7 @@ class ntp::config(
   $config_template = $ntp::config_template,
   $restrict        = $ntp::restrict,
   $servers         = $ntp::servers,
-) {
+) inherits ntp {
 
   file { $config:
     ensure  => file,
diff --git a/manifests/init.pp b/manifests/init.pp
index f109640..2dd9184 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,61 +1,14 @@
-# Class: ntp
-#
-#   This module manages the ntp service.
-#
-#   Jeff McCune <jeff@puppetlabs.com>
-#   2011-02-23
-#
-#   Tested platforms:
-#    - Debian 6.0 Squeeze
-#    - CentOS 5.4
-#    - Amazon Linux 2011.09
-#    - FreeBSD 9.0
-#    - Archlinux
-#
-# Parameters:
-#
-#   $servers = [ '0.debian.pool.ntp.org iburst',
-#                '1.debian.pool.ntp.org iburst',
-#                '2.debian.pool.ntp.org iburst',
-#                '3.debian.pool.ntp.org iburst', ]
-#
-#   $restrict = true
-#     Whether to restrict ntp daemons from allowing others to use as a server.
-#
-#   $autoupdate = false
-#     Whether to update the ntp package automatically or not.
-#
-#   $enable = true
-#     Automatically start ntp deamon on boot.
-#
-#   $template = '${module_name}/${config_tpl}'
-#     Override with your own explicit template.
-#
-# Actions:
-#
-#  Installs, configures, and manages the ntp service.
-#
-# Requires:
-#
-# Sample Usage:
-#
-#   class { "ntp":
-#     servers    => [ 'time.apple.com' ],
-#     autoupdate => false,
-#   }
-#
-# [Remember: No empty lines between comments and class definition]
 class ntp(
   $autoupdate      = $ntp::params::autoupdate,
   $config          = $ntp::params::config,
   $config_template = $ntp::params::config_template,
-  $enable_service  = $ntp::params::enable_service,
-  $ensure_package  = $ntp::params::ensure_package,
-  $ensure_service  = $ntp::params::ensure_service,
-  $manage_service  = $ntp::params::manage_service,
+  $package_ensure  = $ntp::params::package_ensure,
   $package_name    = $ntp::params::package_name,
   $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 {
 
diff --git a/manifests/install.pp b/manifests/install.pp
index b91538a..95d225b 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -1,10 +1,10 @@
 class ntp::install(
-  $ensure_package = $ntp::ensure_package,
+  $package_ensure = $ntp::package_ensure,
   $package_name   = $ntp::package_name,
-) {
+) inherits ntp {
 
   package { 'ntp':
-    ensure => $ensure_package,
+    ensure => $package_ensure,
     name   => $package_name,
   }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index dd55cd6..7903176 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,10 +1,11 @@
 class ntp::params() {
 
   $autoupdate     = false
-  $enable_service = true
-  $ensure_service = 'running'
-  $ensure_package = 'present'
+  $package_ensure = 'present'
   $restrict       = true
+  $service_enable = true
+  $service_ensure = 'running'
+  $service_manage = true
 
   case $::osfamily {
     'Debian': {
diff --git a/manifests/service.pp b/manifests/service.pp
index 5ec4323..741e65b 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -1,19 +1,18 @@
 class ntp::service (
-  $enable_service = $ntp::enable_service,
-  $ensure_service = $ntp::ensure_service,
-  $manage_service = $ntp::manage_service,
+  $service_enable = $ntp::service_enable,
+  $service_ensure = $ntp::service_ensure,
+  $service_manage = $ntp::service_manage,
   $service_name   = $ntp::service_name,
-) {
+) inherits ntp {
 
-  if ! ($ensure_service in [ 'running', 'stopped' ]) {
-    fail('ensure_service parameter must be running or stopped')
+  if ! ($service_ensure in [ 'running', 'stopped' ]) {
+    fail('service_ensure parameter must be running or stopped')
   }
-  validate_bool($enable_service)
 
-  if $manage_service == true {
+  if $service_manage == true {
     service { 'ntp':
-      ensure     => $ensure_service,
-      enable     => $enable_service,
+      ensure     => $service_ensure,
+      enable     => $service_enable,
       name       => $service_name,
       hasstatus  => true,
       hasrestart => true,