From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 9 May 2018 19:01:18 +0000 (-0400)
Subject: Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
X-Git-Tag: v13.1.1~37^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21930%2Fhead;p=ceph.git

Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"

This reverts commit 6c722cd5f3f829ccf14280e7e36387bafd819c7a.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3c6b01574766ca128818461d6630866cc0c0405b)
---

diff --git a/src/stop.sh b/src/stop.sh
index 1bae5d3c9af33..f83a43f2b7174 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -80,8 +80,8 @@ while [ $# -ge 1 ]; do
 done
 
 if [ $stop_all -eq 1 ]; then
-    if "${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config >/dev/null 2>&1; then
-        "${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config | tail -n +2 |
+    if "${CEPH_BIN}"/rbd device list -c $conf_fn >/dev/null 2>&1; then
+        "${CEPH_BIN}"/rbd device list -c $conf_fn | tail -n +2 |
         while read DEV; do
             # While it is currently possible to create an rbd image with
             # whitespace chars in its name, krbd will refuse mapping such
@@ -89,10 +89,10 @@ if [ $stop_all -eq 1 ]; then
             # same goes for whitespace chars in names of the pools that
             # contain rbd images).
             DEV="$(echo "${DEV}" | tr -s '[:space:]' | awk '{ print $5 }')"
-            sudo "${CEPH_BIN}"/rbd device unmap "${DEV}" -c $conf_fn --no-mon-config
+            sudo "${CEPH_BIN}"/rbd device unmap "${DEV}" -c $conf_fn
         done
 
-	if [ -n "$("${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config)" ]; then
+        if [ -n "$("${CEPH_BIN}"/rbd device list -c $conf_fn)" ]; then
             echo "WARNING: Some rbd images are still mapped!" >&2
         fi
     fi