[icinga-checkins] icinga.org: puppet-icinga2/master: removeing timeperiod_ reference from params from template

git at icinga.org git at icinga.org
Wed Nov 12 06:50:11 CET 2014


Module: puppet-icinga2
Branch: master
Commit: 4e5c31b955aaf1fafaa7e56e0912571408d72e60
URL:    https://git.icinga.org/?p=puppet-icinga2.git;a=commit;h=4e5c31b955aaf1fafaa7e56e0912571408d72e60

Author: Steven Bambling <smbambling at gmail.com>
Date:   Tue Nov 11 06:20:41 2014 -0500

removeing timeperiod_ reference from params from template

Signed-off-by: Nick Chappell <nick at intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217

---

 templates/object_timeperiod.conf.erb |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/object_timeperiod.conf.erb b/templates/object_timeperiod.conf.erb
index a08f360..4c6e899 100644
--- a/templates/object_timeperiod.conf.erb
+++ b/templates/object_timeperiod.conf.erb
@@ -10,7 +10,7 @@
 *
 */
 
-object TimePeriod "<%= @object_timeperiod_name %>" {
+object TimePeriod "<%= @object_name %>" {
   <%#- If any of the @ parameters are undefined, don't print anything for them: -%>
   <%#- Otherwise, include the parameter: -%>
   <%- if @timeperiod_template_to_import -%>
@@ -18,12 +18,12 @@ object TimePeriod "<%= @object_timeperiod_name %>" {
   <%- end -%>
 
   display_name = "<%= @timeperiod_display_name %>"
-  <%- if @timeperiod_methods_update -%>
-  methods.update = "<%= @timeperiod_methods_update -%>"
+  <%- if @methods_update -%>
+  methods.update = "<%= @methods_update -%>"
   <%- end -%>
-  <%- if @timeperiod_ranges.empty? != true -%>
+  <%- if @ranges.empty? != true -%>
   ranges = {
-  <%- @timeperiod_ranges.each_pair do |key,value| -%>
+  <%- @ranges.each_pair do |key,value| -%>
     "<%= key %>" = "<%= value %>"
   <%- end -%>
   }



More information about the icinga-checkins mailing list