[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: fix syntax for variable variables in erb

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352736 )

Change subject: icinga: fix syntax for variable variables in erb
......................................................................

icinga: fix syntax for variable variables in erb

Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/352736/1

diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 17e6055..e31ca30 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -32,9 +32,9 @@
         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::#{contact} %>::email']) %>
+        pager                           <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::pager']) %>
+        address1                        <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::address1']) %>
         host_notification_commands      
host-notify-by-email,host-notify-by-sms-gateway
         service_notification_commands   notify-by-email,notify-by-sms-gateway
 }
@@ -47,9 +47,9 @@
         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::#{contact} %>::email']) %>
+        pager                           <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::pager']) %>
+        address1                        <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::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/352736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits