diff options
author | Varac <varac@leap.se> | 2014-12-04 17:30:07 +0800 |
---|---|---|
committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-12-04 17:30:07 +0800 |
commit | 60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (patch) | |
tree | e938e8bc993104715c79595af313f9d8485f5125 /puppet/modules/site_nagios/manifests/add_host_services.pp | |
parent | acd6dd2848f38ba1b728f263f297bc6d2ad9e4bb (diff) | |
parent | a84272aa77715a4029ebd06b38b7a5ad05e6acd0 (diff) |
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/add_host_services.pp')
-rw-r--r-- | puppet/modules/site_nagios/manifests/add_host_services.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_host_services.pp b/puppet/modules/site_nagios/manifests/add_host_services.pp index 279809d1..236702e2 100644 --- a/puppet/modules/site_nagios/manifests/add_host_services.pp +++ b/puppet/modules/site_nagios/manifests/add_host_services.pp @@ -4,7 +4,9 @@ define site_nagios::add_host_services ( $ip_address, $services, $ssh_port, - $openvpn_gateway_address='' ) { + $environment, + $openvpn_gateway_address='', + ) { $nagios_hostname = $domain_internal @@ -16,6 +18,7 @@ define site_nagios::add_host_services ( 'hostname' => $nagios_hostname, 'ip_address' => $ip_address, 'openvpn_gw' => $openvpn_gateway_address, + 'environment' => $environment } $dynamic_parameters = { 'service' => '%s' |