From 3c86d6a60034f0e82e6ce3e7968db0c711d3d9e0 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 26 Jan 2013 22:36:52 +0100 Subject: Added $stored_config parameter to disabledisable collection of exported resources On masterless setups, this module would otherwise complain --- manifests/base.pp | 62 ++++--------------------------------------------------- 1 file changed, 4 insertions(+), 58 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 4922cdb..6fca2d3 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -75,64 +75,6 @@ class nagios::base { } } - Nagios_command <<||>> - Nagios_contactgroup <<||>> - Nagios_contact <<||>> - Nagios_hostdependency <<||>> - Nagios_hostescalation <<||>> - Nagios_hostextinfo <<||>> - Nagios_hostgroup <<||>> - Nagios_host <<||>> - Nagios_servicedependency <<||>> - Nagios_serviceescalation <<||>> - Nagios_servicegroup <<||>> - Nagios_serviceextinfo <<||>> - Nagios_service <<||>> - Nagios_timeperiod <<||>> - - Nagios_command <||> { - notify => Service['nagios'], - } - Nagios_contact <||> { - notify => Service['nagios'], - } - Nagios_contactgroup <||> { - notify => Service['nagios'], - } - Nagios_host <||> { - notify => Service['nagios'], - } - Nagios_hostdependency <||> { - notify => Service['nagios'], - } - Nagios_hostescalation <||> { - notify => Service['nagios'], - } - Nagios_hostextinfo <||> { - notify => Service['nagios'], - } - Nagios_hostgroup <||> { - notify => Service['nagios'], - } - Nagios_service <||> { - notify => Service['nagios'], - } - Nagios_servicegroup <||> { - notify => Service['nagios'], - } - Nagios_servicedependency <||> { - notify => Service['nagios'], - } - Nagios_serviceescalation <||> { - notify => Service['nagios'], - } - Nagios_serviceextinfo <||> { - notify => Service['nagios'], - } - Nagios_timeperiod <||> { - notify => Service['nagios'], - } - file{ [ "${cfg_dir}/nagios_command.cfg", "${cfg_dir}/nagios_contact.cfg", @@ -179,4 +121,8 @@ class nagios::base { purge => true; } } + + if ( $nagios::stored_config == true ) { + include ::nagios::stored_config + } } -- cgit v1.2.3