diff options
| author | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-07-30 12:58:59 -0400 |
|---|---|---|
| committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2013-07-30 12:58:59 -0400 |
| commit | 7fbbbd0796caf0145b46887b55a7e2fd17a3ebb0 (patch) | |
| tree | 74d02b102d856018620be812fc86fc557a374400 | |
| parent | 768e4dc230f7d81d4ae836396bcd458d7a1bff7a (diff) | |
Convert some classes to not be parameterized.
We're following (where possible) the pattern of having parameters only
exist on interface classes. As ntp::config and ntp::install are just
internal, private, classes, these don't make sense to allow changes to.
| -rw-r--r-- | manifests/config.pp | 29 | ||||
| -rw-r--r-- | manifests/install.pp | 9 | ||||
| -rw-r--r-- | manifests/service.pp | 13 |
3 files changed, 27 insertions, 24 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index e5dd5ae..c8a5625 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,17 +1,18 @@ -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, -) inherits ntp { +# +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 if $keys_enable { $directory = dirname($keys_file) diff --git a/manifests/install.pp b/manifests/install.pp index 94cb080..e175964 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,7 +1,8 @@ -class ntp::install ( - $package_ensure = $ntp::package_ensure, - $package_name = $ntp::package_name, -) inherits ntp { +# +class ntp::install { + + $package_ensure = $ntp::package_ensure + $package_name = $ntp::package_name package { 'ntp': ensure => $package_ensure, diff --git a/manifests/service.pp b/manifests/service.pp index 741e65b..2b1eee0 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,9 +1,10 @@ -class ntp::service ( - $service_enable = $ntp::service_enable, - $service_ensure = $ntp::service_ensure, - $service_manage = $ntp::service_manage, - $service_name = $ntp::service_name, -) inherits ntp { +# +class ntp::service { + + $service_enable = $ntp::service_enable + $service_ensure = $ntp::service_ensure + $service_manage = $ntp::service_manage + $service_name = $ntp::service_name if ! ($service_ensure in [ 'running', 'stopped' ]) { fail('service_ensure parameter must be running or stopped') |