From: Sébastien Han <seb@redhat.com>
Date: Fri, 22 Sep 2017 15:45:35 +0000 (+0200)
Subject: handler: display ceph status properly
X-Git-Tag: v3.0.0rc11~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1945%2Fhead;p=ceph-ansible.git

handler: display ceph status properly

Fix bash error, doing ceph "$CEPH_CLI" -s gives us

ceph '--name client.bootstrap-osd --keyring
/var/lib/ceph/bootstrap-osd/test.keyring --cluster test' -s

which results in a wrongly formatted command. Removing the double quotes
expands the array properly.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-defaults/templates/restart_osd_daemon.sh.j2 b/roles/ceph-defaults/templates/restart_osd_daemon.sh.j2
index d471f59b1..856464ffe 100644
--- a/roles/ceph-defaults/templates/restart_osd_daemon.sh.j2
+++ b/roles/ceph-defaults/templates/restart_osd_daemon.sh.j2
@@ -16,7 +16,7 @@ check_pgs() {
   echo "Error while running 'ceph $CEPH_CLI -s', PGs were not reported as active+clean"
   echo "It is possible that the cluster has less OSDs than the replica configuration"
   echo "Will refuse to continue"
-  $docker_exec ceph "$CEPH_CLI" -s
+  $docker_exec ceph $CEPH_CLI -s
   exit 1
 }