From 1e511a0e3ac71542001c61ae70809b6a3a19778c Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 9 Sep 2014 14:48:55 +0200 Subject: [PATCH] Rename `icingaweb2::config::monitoring' to `icingaweb2::config::module' refs #6842 --- .../modules/icingaweb2/manifests/config/module.pp | 6 ++++++ .../modules/icingaweb2/manifests/config/monitoring.pp | 6 ------ .vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 .vagrant-puppet/modules/icingaweb2/manifests/config/module.pp delete mode 100644 .vagrant-puppet/modules/icingaweb2/manifests/config/monitoring.pp diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp new file mode 100644 index 000000000..ece68c025 --- /dev/null +++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp @@ -0,0 +1,6 @@ +define icingaweb2::config::module ($source, $module = 'monitoring', $replace = true) { + icingaweb2::config { "modules/${module}/${name}": + source => $source, + replace => $replace, + } +} diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/monitoring.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/monitoring.pp deleted file mode 100644 index 151252185..000000000 --- a/.vagrant-puppet/modules/icingaweb2/manifests/config/monitoring.pp +++ /dev/null @@ -1,6 +0,0 @@ -define icingaweb2::config::monitoring ($source, $replace = true) { - icingaweb2::config { "modules/monitoring/${name}": - source => $source, - replace => $replace, - } -} diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp index 2f1e3e012..576c431d6 100644 --- a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp +++ b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp @@ -56,5 +56,5 @@ class icingaweb2_dev { replace => false, } - icingaweb2::config::monitoring { [ 'backends', 'config', 'instances' ]: } + icingaweb2::config::module { [ 'backends', 'config', 'instances' ]: } }