From: Sébastien Han <sebastien.han@enovance.com>
Date: Mon, 30 Mar 2015 20:13:29 +0000 (+0200)
Subject: Improve regex syntax
X-Git-Tag: v1.0.0~232^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=557c5790d933e185a8405bf422edcd4d29e83f75;p=ceph-ansible.git

Improve regex syntax

Chain sed commands with ';' and add '-s' to grep for quiet output

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/rolling_update.yml b/rolling_update.yml
index 607096a22..1b3d96b90 100644
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@ -54,7 +54,7 @@
 
     - name: Waiting for the monitor to join the quorum...
       shell: >
-        ceph -s | grep monmap | sed 's/.*quorum//' | egrep -q {{ ansible_hostname }}
+        ceph -s | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
       register: result
       until: result.rc == 0
       retries: 5
@@ -102,7 +102,7 @@
 
     - name: Waiting for clean PGs...
       shell: >
-        test "$(ceph pg stat | sed 's/^.*pgs://' | sed 's/active+clean.*//' |sed 's/ //')" -eq "$(ceph pg stat | sed 's/pgs.*//' | sed 's/^.*://' | sed 's/ //')" && ceph health | egrep -q "HEALTH_OK|HEALTH_WARN"
+        test "$(ceph pg stat | sed 's/^.*pgs://;s/active+clean.*//;s/ //')" -eq "$(ceph pg stat | sed 's/pgs.*//;s/^.*://;s/ //')" && ceph health | egrep -sq "HEALTH_OK|HEALTH_WARN"
       register: result
       until: result.rc == 0
       retries: 10