Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352717 )

Change subject: nagios_common: move new icinga contacts to Hiera top-level 
(debug)
......................................................................


nagios_common: move new icinga contacts to Hiera top-level (debug)

Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 3 insertions(+), 3 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 006a765..231be6d 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -31,9 +31,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::dzahn::email']) %>
-        pager                           <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
-        address1                        <%= 
scope.function_hiera(['icinga::contacts::dzahn::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
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to