summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-09-15 09:37:01 +1000
committerJames Turnbull <james@lovedthanlost.net>2009-09-15 09:37:01 +1000
commitb77d6e8083606f64aad1a9683f1bd92d14be1179 (patch)
tree978cc57ca162e934ff82d7f15ec2b6d517712aca
parent40cd6d413257e840b357ddd243499b8c441b0ff0 (diff)
parentf2bc8aafcb9965b08a2442ed22b8942ade1f9b9d (diff)
downloadpuppet-b77d6e8083606f64aad1a9683f1bd92d14be1179.tar.gz
puppet-b77d6e8083606f64aad1a9683f1bd92d14be1179.tar.xz
puppet-b77d6e8083606f64aad1a9683f1bd92d14be1179.zip
Merge branch 'tickets/0.25.x/2634' into 0.25.x
-rwxr-xr-xlib/puppet/external/nagios/base.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 5185c92f7..69c2c6aab 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -423,9 +423,10 @@ class Nagios::Base
end
newtype :serviceescalation do
- setparameters :host_name, :hostgroup_name, :service_description, :contacts,
- :contact_groups, :first_notification, :last_notification,
- :notification_interval, :escalation_period, :escalation_options,
+ setparameters :host_name, :hostgroup_name, :servicegroup_name,
+ :service_description, :contacts, :contact_groups,
+ :first_notification, :last_notification, :notification_interval,
+ :escalation_period, :escalation_options,
:register, :use,
:_naginator_name