From 280f9fce6115f9e32d9a905a7da54dde995e9315 Mon Sep 17 00:00:00 2001
From: Quentin Garnier <qgarnier@merethis.com>
Date: Tue, 30 Sep 2014 17:38:42 +0200
Subject: [PATCH] Fix pacemaker ignore action... Should work at last....

---
 apps/pacemaker/local/mode/crm.pm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/pacemaker/local/mode/crm.pm b/apps/pacemaker/local/mode/crm.pm
index a9efcd055..213fcb1ea 100644
--- a/apps/pacemaker/local/mode/crm.pm
+++ b/apps/pacemaker/local/mode/crm.pm
@@ -93,7 +93,8 @@ sub parse_output {
     my @standby;
     $self->{output}->output_add(severity => 'OK', 
                                 short_msg => "Cluster is OK");
-    foreach my $line (split /\n/, $options{crm_out}) {
+    my @lines = split /\n/, $options{crm_out};
+    foreach my $line (shift @lines) {
         if ($line =~ /Connection to cluster failed\:(.*)/i ) {
             $self->{output}->output_add(severity => 'CRITICAL', 
                                         short_msg => "Connection to cluster FAILED: $1");
@@ -125,26 +126,29 @@ sub parse_output {
             $self->{output}->output_add(severity => $self->{threshold}, 
                                         short_msg => "$1 Stopped");
         } elsif ($line =~ /^Failed actions\:/) {
-            # Check Failed Actions
-            my $skip = 0;
-            foreach (@{$self->{option_results}->{ignore_failed_actions}}) {
-                if ($line =~ /$_/) {
-                    $skip = 1;
+            # Check Failed Actions          
+            my $error = 0;
+            foreach my $line_failed_action (shift @lines) {
+                my $skip = 0;
+                foreach (@{$self->{option_results}->{ignore_failed_actions}}) {
+                    if ($line_failed_action =~ /$_/) {
+                        $skip = 1;
+                        last;
+                    }
+                }
+                if ($skip == 0) {
+                    $error = 1;
                     last;
                 }
             }
-            next if ($skip == 1);
-            
-            $self->{output}->output_add(severity => 'CRITICAL', 
-                                        short_msg => "FAILED actions detected or not cleaned up");
+            if ($error == 1) {
+                $self->{output}->output_add(severity => 'CRITICAL', 
+                                            short_msg => "FAILED actions detected or not cleaned up");
+            }
         } elsif ($line =~ /\s*(\S+?)\s+ \(.*\)\:\s+\w+\s+\w+\s+\(unmanaged\)\s+FAILED/) {
             # Check Unmanaged
             $self->{output}->output_add(severity => 'CRITICAL', 
                                         short_msg => "$1 unmanaged FAILED");
-        } elsif ($line =~ /\s*(\S+?)\s+ \(.*\)\:\s+not installed/i) {
-            # Check for errors
-            $self->{output}->output_add(severity => 'CRITICAL', 
-                                        short_msg => "$1 not installed");
         } elsif ($line =~ /\s*(\S+?):.*(fail-count=\d+)/i) {
             # Check for resource Fail count
             $self->{output}->output_add(severity => 'WARNING',