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@inodes.org>

2 files changed, 5 insertions, 1 deletions

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