diff options
| author | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-07-05 18:52:04 -0400 |
|---|---|---|
| committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-07-05 18:53:55 -0400 |
| commit | 75efd2a9e423d421a970eafe4e10071676c81561 (patch) | |
| tree | bfc80dc9f920a278e9c4c99b3e9b7246f1740ade /manifests | |
| parent | dc0efbfacf6f7135e0437495e6f69f971da6285d (diff) | |
Some syntax fixes as well as deprecate autoupdate.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 1 | ||||
| -rw-r--r-- | manifests/install.pp | 11 | ||||
| -rw-r--r-- | manifests/params.pp | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 845bbb9..ad443c3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -51,6 +51,7 @@ class ntp( $config_template = $ntp::params::config_template, $enable_service = $ntp::params::enable_service, $ensure_service = $ntp::params::ensure_service, + $package_ensure = $ntp::params::package_ensure, $package_name = $ntp::params::package_name, $restrict = $ntp::params::restrict, $servers = $ntp::params::servers, diff --git a/manifests/install.pp b/manifests/install.pp index beaf197..f9c61f1 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,15 +1,8 @@ class ntp::install( - $autoupdate = $ntp::autoupdate, - $package_name = $ntp::package_name, + $package_ensure = $ntp::package_ensure, + $package_name = $ntp::package_name, ) { - validate_bool($autoupdate) - - $package_ensure = $autoupdate ? { - true => 'latest', - default => 'present', - } - package { 'ntp': ensure => $package_ensure, name => $package_name, diff --git a/manifests/params.pp b/manifests/params.pp index 9d20a13..91186da 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,8 +3,13 @@ class ntp::params() { $autoupdate = false $enable_service = true $ensure_service = 'running' + $package_ensure = 'present' $restrict = true + if $autoupdate { + notice('autoupdate parameter has been deprecated and replaced with package_ensure. Set this to latest for the same behavior as autoupdate => true.') + } + case $::osfamily { 'Debian': { $config = '/etc/ntp.conf' @@ -61,7 +66,7 @@ class ntp::params() { $config_template = 'ntp/ntp.conf.archlinux.erb' $package_name = ['ntp'] $service_name = 'ntpd' - $servers = [ + $servers = [ '0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', |