diff options
| author | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-08-29 08:42:24 -0700 |
|---|---|---|
| committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-08-29 08:42:24 -0700 |
| commit | 8a554ab4b00e25f52a337c4c974fd89f44042957 (patch) | |
| tree | cdb4ee2b1a8f9b8ac4935370f62e1405a3044034 | |
| parent | 8be3334e4ab71d778ebd6199d86822c0fb977291 (diff) | |
| parent | 8528d604a4fdc6ab242f05d522d66dd4f1c90f3c (diff) | |
Remove variables, switch to inherits.
| -rw-r--r-- | manifests/config.pp | 15 | ||||
| -rw-r--r-- | manifests/install.pp | 5 | ||||
| -rw-r--r-- | manifests/service.pp | 7 |
3 files changed, 3 insertions, 24 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index c8a5625..1c8963d 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,18 +1,5 @@ # -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 - $preferred_servers = $ntp::preferred_servers - $restrict = $ntp::restrict - $servers = $ntp::servers +class ntp::config inherits ntp { if $keys_enable { $directory = dirname($keys_file) diff --git a/manifests/install.pp b/manifests/install.pp index e175964..098949c 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,8 +1,5 @@ # -class ntp::install { - - $package_ensure = $ntp::package_ensure - $package_name = $ntp::package_name +class ntp::install inherits ntp { package { 'ntp': ensure => $package_ensure, diff --git a/manifests/service.pp b/manifests/service.pp index 2b1eee0..3f1ada0 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,10 +1,5 @@ # -class ntp::service { - - $service_enable = $ntp::service_enable - $service_ensure = $ntp::service_ensure - $service_manage = $ntp::service_manage - $service_name = $ntp::service_name +class ntp::service inherits ntp { if ! ($service_ensure in [ 'running', 'stopped' ]) { fail('service_ensure parameter must be running or stopped') |