x/fuel-plugin-lma-infrastructure-alerting
Code Issues Proposed changes

Be idempotent with concatenated strings

Browse Source 
Change-Id: I2ad22d0c55a8ad11c3be81da6cc8ecbeb90ac422
This commit is contained in:
Swann Croiset 2015-08-26 18:47:31 +02:00
parent 262ba9baa7
commit 7d3e57ff3f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_scripts/puppet/modules/nagios/manifests/contact.pp
View File

@ -60,7 +60,7 @@ define nagios::contact (
}
if is_array($properties['contactgroups']){
$opts['contactgroups'] = join($properties['contactgroups'], ',')
$opts['contactgroups'] = join(sort($properties['contactgroups']), ',')
}else{
$opts['contactgroups'] = $properties['contactgroups']
}
@ -97,13 +97,13 @@ define nagios::contact (
}
}
if is_array($properties['service_notification_commands']) {
$opts['service_notification_commands'] = join($properties['service_notification_commands'], ',')
$opts['service_notification_commands'] = join(sort($properties['service_notification_commands']), ',')
}
if $properties['host_notification_commands'] == undef {
$opts['host_notification_commands'] = $nagios::params::host_notification_commands
}
if is_array($properties['host_notification_commands']) {
$opts['host_notification_commands'] = join($properties['host_notification_commands'], ',')
$opts['host_notification_commands'] = join(sort($properties['host_notification_commands']), ',')
}
if $onefile {

2
deployment_scripts/puppet/modules/nagios/manifests/host.pp
View File

@ -36,7 +36,7 @@ define nagios::host (
$opts = {}
if is_array($properties['contact_groups']){
$opts['contact_groups'] = join($properties['contact_groups'], ',')
$opts['contact_groups'] = join(sort($properties['contact_groups']), ',')
}else{
$opts['contact_groups'] = $properties['contact_groups']
}

4
deployment_scripts/puppet/modules/nagios/manifests/hostgroup.pp
View File

@ -35,13 +35,13 @@ define nagios::hostgroup (
$opts = {}
if is_array($properties['members']){
$opts['members'] = join($properties['members'], ',')
$opts['members'] = join(sort($properties['members']), ',')
} elsif $properties['members']{
$opts['members'] = $properties['members']
}
if is_array($properties['hostgroup_members']){
$opts['hostgroup_members'] = join($properties['hostgroup_members'], ',')
$opts['hostgroup_members'] = join(sort($properties['hostgroup_members']), ',')
}elsif $properties['hostgroup_members']{
$opts['hostgroup_members'] = $properties['hostgroup_members']
}

4
deployment_scripts/puppet/modules/nagios/manifests/service.pp
View File

@ -36,13 +36,13 @@ define nagios::service (
$opts = {}
if is_array($properties['contact_groups']){
$opts['contact_groups'] = join($properties['contact_groups'], ',')
$opts['contact_groups'] = join(sort($properties['contact_groups']), ',')
}else{
$opts['contact_groups'] = $properties['contact_groups']
}
if is_array($properties['hostgroup_name']){
$opts['hostgroup_name'] = join($properties['hostgroup_name'], ',')
$opts['hostgroup_name'] = join(sort($properties['hostgroup_name']), ',')
}else{
$opts['hostgroup_name'] = $properties['hostgroup_name']
}