summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG4
-rwxr-xr-xlib/puppet/external/nagios/base.rb3
-rw-r--r--lib/puppet/type/nagios_hostdependency.rb3
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4daa9f524..d6596627b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
0.24.7
+ Fixed #1496 - nagios_servicedependency needs a unique host_name?
+
+ Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
Bug #1803 Zfs should auto require the ancestor file systems
Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 9b9d7ca34..6a0c1831c 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -437,7 +437,8 @@ 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 :_naginator_name
end
diff --git a/lib/puppet/type/nagios_hostdependency.rb b/lib/puppet/type/nagios_hostdependency.rb
new file mode 100644
index 000000000..fea71a619
--- /dev/null
+++ b/lib/puppet/type/nagios_hostdependency.rb
@@ -0,0 +1,3 @@
+require 'puppet/util/nagios_maker'
+
+Puppet::Util::NagiosMaker.create_nagios_type :hostdependency