[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[John Ferlito]

The following commit has been merged in the master branch:
commit da71ad53cc49b9a8c56785d865c47bb282e467b6
Author: John Ferlito <johnf at inodes.org>
Date:   Tue Dec 9 11:46:21 2008 +1100

    Add a unique name to objects so we can determine uniqueness when read back in
    
        The nagios object definitions have been updated to correlate with Nagios
        3.0.6.
    
            In Nagios it is possible to have multiple service checks with the
        same service_description. eg I could have an check with a
        service_description of 'SSH' for multiple hosts. So in puppet we can't
        use it as a unique name for the resource. This patch modifies the code
        to use $name as the unique name. For some types eg command_name $name
        ends up in the config and thus we can tell which puppet resources match
        to which nagios ones.  For other types like service there is no direct
        mapping from $name to a nagios attibute. So we use a custom attribute
        called _naginator_name.
    
    Signed-off-by: John Ferlito <johnf at inodes.org>

diff --git a/CHANGELOG b/CHANGELOG
index 4daa9f5..d659662 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 9b9d7ca..6a0c183 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 0000000..fea71a6
--- /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

-- 
Puppet packaging for Debian