diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-12 15:32:42 -0600 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-02-13 14:16:36 +1100 |
| commit | 4dfa034dc8a569634d8b5672f66158157ddddb28 (patch) | |
| tree | 6b3d04dd48b642b18259038a329955b57bd8e697 /lib | |
| parent | d5a193a594bbc2194dbf1e5264369ebea0e55880 (diff) | |
| download | puppet-4dfa034dc8a569634d8b5672f66158157ddddb28.tar.gz puppet-4dfa034dc8a569634d8b5672f66158157ddddb28.tar.xz puppet-4dfa034dc8a569634d8b5672f66158157ddddb28.zip | |
Revert "Refixing #1420 - _naginator_name is only used for services"
This reverts commit efb5cc50c42bc27aec9409e723e3a717ed58c0a8.
Conflicts:
CHANGELOG
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/puppet/external/nagios/base.rb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb index d95b808dd..6a0c1831c 100755 --- a/lib/puppet/external/nagios/base.rb +++ b/lib/puppet/external/nagios/base.rb @@ -416,18 +416,20 @@ class Nagios::Base :dependent_service_description, :host_name, :hostgroup_name, :service_description, :inherits_parent, :execution_failure_criteria, :notification_failure_criteria, :dependency_period, - :register, :use + :register, :use, + :_naginator_name - setnamevar :service_description + setnamevar :_naginator_name end newtype :serviceescalation do setparameters :host_name, :hostgroup_name, :service_description, :contacts, :contact_groups, :first_notification, :last_notification, :notification_interval, :escalation_period, :escalation_options, - :register, :use + :register, :use, + :_naginator_name - setnamevar :service_description + setnamevar :_naginator_name end newtype :hostdependency do @@ -435,18 +437,20 @@ class Nagios::Base setparameters :dependent_host_name, :dependent_hostgroup_name, :host_name, :hostgroup_name, :inherits_parent, :execution_failure_criteria, :notification_failure_criteria, :dependency_period, - :register, :use + :register, :use, + :_naginator_name - setnamevar :host_name + setnamevar :_naginator_name end newtype :hostescalation do setparameters :host_name, :hostgroup_name, :contacts, :contact_groups, :first_notification, :last_notification, :notification_interval, :escalation_period, :escalation_options, - :register, :use + :register, :use, + :_naginator_name - setnamevar :host_name + setnamevar :_naginator_name end newtype :hostextinfo do @@ -463,9 +467,10 @@ class Nagios::Base setparameters :host_name, :service_description, :notes, :notes_url, :action_url, :icon_image, :icon_image_alt, - :register, :use + :register, :use, + :_naginator_name - setnamevar :service_description + setnamevar :_naginator_name end end |