From 01511498337319dce6fd453bede2533b3ccf86dc Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Fri, 11 Oct 2019 10:40:21 -0400
Subject: [PATCH] Clean up NFS unmount during unstack

Don't run umount run if no shares are mounted, which
reduces umount noise.

Change-Id: Ib062afbdbc2ae0ff773741e29402eb13a925d40e
---
 devstack/plugin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cea6ace..49189a2 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -108,7 +108,7 @@ if [[ "$1" == "unstack" ]]; then
     # Unmount any NFS shares mounted by Cinder
     if [[ -d ${DATA_DIR}/cinder/mnt ]]; then
         find ${DATA_DIR}/cinder/mnt -mindepth 1 -maxdepth 1 -type d \
-            | sudo xargs umount -l
+            | sudo xargs --no-run-if-empty umount -l
     fi
 
     sudo rm -f ${STACK_NFS_CONF}