diff options
| author | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-11 10:14:47 +0100 |
|---|---|---|
| committer | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-11 10:14:47 +0100 |
| commit | 473da25b6cb2900d91e4ac782c5538bf9bd3ec1b (patch) | |
| tree | ac4c063e7eaf9c88299fcafb88db4fa36f323352 | |
| parent | 7a3748a089848db18ed474f6e6fdb8caffa5a238 (diff) | |
Revert "Add parameter 'v8plus' for rsyslog version 8+"
This reverts commit 18a16ca041469d99bc0c5d27c46db62a06903ed8.
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | manifests/params.pp | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5758b13..f0b2cd2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -37,8 +37,7 @@ class rsyslog ( $server_conf = $rsyslog::params::server_conf, $ssl = $rsyslog::params::ssl, $modules = $rsyslog::params::modules, - $preserve_fqdn = $rsyslog::params::preserve_fqdn, - $v8plus = $rsyslog::params::v8plus + $preserve_fqdn = $rsyslog::params::preserve_fqdn ) inherits rsyslog::params { class { 'rsyslog::install': } class { 'rsyslog::config': } diff --git a/manifests/params.pp b/manifests/params.pp index 2628d46..f4cd74b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -45,7 +45,6 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true - $v8plus = false } redhat: { if $::operatingsystem == 'Amazon' { @@ -120,7 +119,6 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true - $v8plus = false } sles: { $rsyslog_package_name = 'rsyslog' @@ -142,7 +140,6 @@ class rsyslog::params { $service_name = 'syslog' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" - $v8plus = false } freebsd: { $rsyslog_package_name = 'sysutils/rsyslog5' @@ -176,7 +173,6 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true - $v8plus = false } default: { @@ -213,7 +209,6 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true - $v8plus = false } default: { fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.") |