X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=blobdiff_plain;f=modules%2Fprofile%2Fmanifests%2Fmonitoring%2Flocal_service.pp;h=cf8ef782b5480644a60fc433bc452ccb7a33b354;hp=4d38d69eac4c71a473f59ca77c28a10c12359141;hb=60fb787df260a2fb9cd87761d19eed6e78d0d797;hpb=ec722a207df43c5cb7f69ec91ae0e9d734414c4a diff --git a/modules/profile/manifests/monitoring/local_service.pp b/modules/profile/manifests/monitoring/local_service.pp index 4d38d69..cf8ef78 100644 --- a/modules/profile/manifests/monitoring/local_service.pp +++ b/modules/profile/manifests/monitoring/local_service.pp @@ -31,16 +31,14 @@ define profile::monitoring::local_service ( [true, false].each |$services_for_master| { if $services_for_master { - $default_local = { - mode => "0644", - target => $::profile::monitoring::params::services_for_master, - check_interval => $::profile::monitoring::params::service_local["check_interval"], - retry_interval => $::profile::monitoring::params::service_local["retry_interval"], - host_name => $::profile::monitoring::params::service_local["host_name"], - use => $::profile::monitoring::params::service_types["passive"], - servicegroups => $service_group, - notify => [], - } + $default_local = merge( + $::profile::monitoring::params::service_local_for_master, + { + mode => "0644", + target => $::profile::monitoring::params::services_for_master, + servicegroups => $service_group, + notify => [], + }) $t = "master - " $services_key = $master } else {