diff options
| author | Micah <micah@riseup.net> | 2017-07-21 19:13:00 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2017-07-21 19:13:00 +0000 |
| commit | 15aba17d007e076ea09e50c837081ee1bec1b301 (patch) | |
| tree | f71eb0450d8e8ef4ef10d7f3c0b6641399f3babe | |
| parent | 818f93b83848325e27dbd009e257fe3163cdd4bb (diff) | |
| parent | cac46e3649d5f190c2e8c3933c5f9af8065ebf1d (diff) | |
Merge branch 'params2' into 'master'
fix syntax errors
See merge request !18
| -rw-r--r-- | manifests/agent/register.pp | 2 | ||||
| -rw-r--r-- | manifests/server/collect_ps.pp | 2 | ||||
| -rw-r--r-- | manifests/server/configure_ssh.pp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/manifests/agent/register.pp b/manifests/agent/register.pp index a609a45..51c803d 100644 --- a/manifests/agent/register.pp +++ b/manifests/agent/register.pp @@ -2,7 +2,7 @@ class check_mk::agent::register ( $host_tags = '', $hostname = $::fqdn, $etc_dir = $check_mk::params::etc_dir -) inherit check_mk::params { +) inherits check_mk::params { @@check_mk::host { $hostname: host_tags => $host_tags, target => "${etc_dir}/check_mk/main.mk", diff --git a/manifests/server/collect_ps.pp b/manifests/server/collect_ps.pp index 84bb724..5b8456c 100644 --- a/manifests/server/collect_ps.pp +++ b/manifests/server/collect_ps.pp @@ -1,6 +1,6 @@ class check_mk::server::collect_ps ( $config = "${check_mk::config::etc_dir}/check_mk/conf.d/ps.mk" -) inherit check_mk::params { +) inherits check_mk::params { # this class gets run on the check-mk server in order to collect the # stored configs created on clients and assemble the ps.mk config file diff --git a/manifests/server/configure_ssh.pp b/manifests/server/configure_ssh.pp index 29cf95b..3b517f7 100644 --- a/manifests/server/configure_ssh.pp +++ b/manifests/server/configure_ssh.pp @@ -1,9 +1,9 @@ class check_mk::server::configure_ssh ( - $check_mk_tag = 'check_mk_sshkey' + $check_mk_tag = 'check_mk_sshkey', $etc_dir = $check_mk::params::etc_dir, $shelluser = $check_mk::params::shelluser, $shellgroup = $check_mk::params::shellgroup, -) inherit check_mk::params { +) inherits check_mk::params { # collect exported files from client::generate_sshkey File <<| tag == $check_mk_tag |>> |