[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-98-gf19c0e5

[James Turnbull]

The following commit has been merged in the master branch:
commit efb5cc50c42bc27aec9409e723e3a717ed58c0a8
Author: Luke Kanies <luke at madstop.com>
Date:   Tue Feb 10 17:33:26 2009 -0600

    Refixing #1420 - _naginator_name is only used for services
    
    According to:
    
    http://nagios.sourceforge.net/docs/3_0/customobjectvars.html
    
    the special underscore parameters are only supported
    on hosts, contacts, and services.  This commit reverts
    most of the changes that set Nagios types to use such
    a parameter as the namevar.
    
    The original commit should have been broken into two commits:
    one to reorganize the file, and the other to make these changes.
    As it was, the revert was much harder than it should have been.
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/CHANGELOG b/CHANGELOG
index ad5bfc9..8f84116 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.8
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
     Fixed #1884 - Exported resources are marked as unexported when collected on the exporting host
 
     Fixed #1922 - Functions squash all arguments into a single hash
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 6a0c183..d95b808 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -416,20 +416,18 @@ class Nagios::Base
             :dependent_service_description, :host_name, :hostgroup_name,
             :service_description, :inherits_parent, :execution_failure_criteria,
             :notification_failure_criteria, :dependency_period,
-            :register, :use,
-            :_naginator_name
+            :register, :use
 
-        setnamevar :_naginator_name
+        setnamevar :service_description
     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,
-            :_naginator_name
+            :register, :use
 
-        setnamevar :_naginator_name
+        setnamevar :service_description
     end
 
     newtype :hostdependency do
@@ -437,20 +435,18 @@ 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,
-          :_naginator_name
+          :register, :use
 
-      setnamevar :_naginator_name
+      setnamevar :host_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,
-            :_naginator_name
+            :register, :use
 
-        setnamevar :_naginator_name
+        setnamevar :host_name
     end
 
     newtype :hostextinfo do
@@ -467,10 +463,9 @@ class Nagios::Base
 
         setparameters :host_name, :service_description, :notes, :notes_url,
             :action_url, :icon_image, :icon_image_alt,
-            :register, :use,
-            :_naginator_name
+            :register, :use
 
-        setnamevar :_naginator_name
+        setnamevar :service_description
     end
 
 end

-- 
Puppet packaging for Debian