Try to make dsa-check-hpssacli cron entry setup code easier to read

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 7868e29..cd8afaa 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -28,22 +28,18 @@ class hardware::raid::proliant {
                }
 
                if $::smartarraycontroller_hpsa {
-                       if $::hostname in [lobos,villa] {
-                               concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
-                                       target => '/etc/cron.d/dsa-puppet-stuff',
-                                       order  => '020',
-                                       content  => @(EOF)
-                                               27 */2 * * * root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli --no-battery
-                                               | EOF
-                               }
-                       } else {
-                               concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
-                                       target => '/etc/cron.d/dsa-puppet-stuff',
-                                       order  => '020',
-                                       content  => @(EOF)
-                                               27 */2 * * * root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
-                                               | EOF
-                               }
+                       $cmd = $hostname ? {
+                               'lobos' => 'dsa-check-hpssacli --no-battery',
+                               'villa' => 'dsa-check-hpssacli --no-battery',
+                               default => 'dsa-check-hpssacli'
+                       }
+
+                       concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
+                               target => '/etc/cron.d/dsa-puppet-stuff',
+                               order  => '020',
+                               content  => @("EOF")
+                                       27 */2 * * * root sleep $(( RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
+                                       | EOF
                        }
                }
                file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }