Blame SOURCES/bz1830716-NovaEvacuate-suppress-expected-error.patch

5fdbe4
From 143864c694fb3f44a28b805a17ba7a2f6bf9931f Mon Sep 17 00:00:00 2001
5fdbe4
From: Vincent Untz <vuntz@suse.com>
5fdbe4
Date: Sun, 07 Feb 2016 10:30:00 +0100
5fdbe4
Subject: [PATCH] NovaEvacuate: Avoid initial useless message on stderr
5fdbe4
5fdbe4
When no evacuation has been done yet, we're spamming syslog with:
5fdbe4
5fdbe4
  Could not query value of evacuate: attribute does not exist
5fdbe4
5fdbe4
So let's just filter this out, since it's known to be expected on
5fdbe4
initial setup.
5fdbe4
5fdbe4
As this requires a bashism, also move the script to use bash.
5fdbe4
5fdbe4
Change-Id: I3351919febc0ef0101e4a08ce6eb412e3c7cfc76
5fdbe4
---
5fdbe4
5fdbe4
diff --git a/heartbeat/NovaEvacuate b/heartbeat/NovaEvacuate
5fdbe4
index 319a747..f764bde 100644
5fdbe4
--- a/heartbeat/NovaEvacuate
5fdbe4
+++ b/heartbeat/NovaEvacuate
5fdbe4
@@ -1,4 +1,4 @@
5fdbe4
-#!/bin/sh
5fdbe4
+#!/bin/bash
5fdbe4
 #
5fdbe4
 #
5fdbe4
 # NovaCompute agent manages compute daemons.
5fdbe4
@@ -220,7 +220,8 @@
5fdbe4
     fi
5fdbe4
 
5fdbe4
     handle_evacuations $(
5fdbe4
-        attrd_updater -n evacuate -A |
5fdbe4
+        attrd_updater -n evacuate -A \
5fdbe4
+            2> >(grep -v "attribute does not exist" 1>&2) |
5fdbe4
             sed 's/ value=""/ value="no"/' |
5fdbe4
             tr '="' '  ' |
5fdbe4
             awk '{print $4" "$6}'