From 62def403dc2e88fb1f140c0852c6db30621aa66f Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 2 Sep 2014 13:12:41 +0200 Subject: [PATCH] Puppet style guide: don't define define inside a class refs #6842 --- .vagrant-puppet/modules/icinga2/manifests/config.pp | 11 +++++++++++ .../profiles/icinga2_dev/manifests/init.pp | 13 +++---------- 2 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 .vagrant-puppet/modules/icinga2/manifests/config.pp diff --git a/.vagrant-puppet/modules/icinga2/manifests/config.pp b/.vagrant-puppet/modules/icinga2/manifests/config.pp new file mode 100644 index 000000000..310dea1e7 --- /dev/null +++ b/.vagrant-puppet/modules/icinga2/manifests/config.pp @@ -0,0 +1,11 @@ +define icinga2::config ($source) { + include icinga2 + + $path = "/etc/icinga2/${name}.conf" + file { $path: + source => "${source}${path}", + owner => 'icinga', + group => 'icinga', + require => Class['icinga2'], + } +} diff --git a/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp index 611d0f116..5a34707e9 100644 --- a/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp @@ -2,15 +2,8 @@ class icinga2_dev { include icinga2 include icinga2_mysql - define icinga2_config { - $path = "/etc/icinga2/${name}.conf" - file { $path: - source => "puppet:///modules/icinga2_dev${path}", - owner => 'icinga', - group => 'icinga', - require => Class['icinga2'], - } + icinga2::config { [ + 'conf.d/test-config', 'conf.d/commands', 'constants' ]: + source => 'puppet:///modules/icinga2_dev', } - - icinga2_config { [ 'conf.d/test-config', 'conf.d/commands', 'constants' ]: } }