Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352738 )
Change subject: icinga: stop trying to use variable variables in erb
......................................................................
icinga: stop trying to use variable variables in erb
Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 8 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb
b/modules/nagios_common/templates/contacts-new.cfg.erb
index b951926..9da04d9 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -26,30 +26,29 @@
<%- contact = 'dzahn' -%>
define contact{
- contact_name <%= contact %>
+ contact_name dzahn
alias daniel_zahn
host_notification_period PST_awake_hours
service_notification_period PST_awake_hours
host_notification_options d,r,f
service_notification_options c,r,f
- email <%=
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
- pager <%=
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
- address1 <%=
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+ email <%=
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
+ pager <%=
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
+ address1 <%=
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
host_notification_commands
host-notify-by-email,host-notify-by-sms-gateway
service_notification_commands notify-by-email,notify-by-sms-gateway
}
-<%- contact = 'bblack' -%>
define contact{
- contact_name <%= contact %>
+ contact_name bblack
alias Brandon Black
host_notification_period 24x7
service_notification_period 24x7
host_notification_options d,r,f
service_notification_options c,r,f
- email <%=
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
- pager <%=
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
- address1 <%=
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+ email <%=
scope.function_hiera(['icinga::contacts::bblack::email']) %>
+ pager <%=
scope.function_hiera(['icinga::contacts::bblack::pager']) %>
+ address1 <%=
scope.function_hiera(['icinga::contacts::bblack::address1']) %>
host_notification_commands
host-notify-by-email,host-notify-by-sms-gateway
service_notification_commands notify-by-email,notify-by-sms-gateway
}
--
To view, visit https://gerrit.wikimedia.org/r/352738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
