From: David Galloway <dgallowa@redhat.com>
Date: Wed, 4 Oct 2017 19:44:43 +0000 (-0400)
Subject: install: Unmount /var/lib/ceph itself if needed
X-Git-Tag: 1.1.0~387^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8ef4f6d350b63b633f507116d1ea60ae6a9f30be;p=teuthology.git

install: Unmount /var/lib/ceph itself if needed

We plan to mount a small logical volume to /var/lib/ceph.

Fixes: http://tracker.ceph.com/issues/20910

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index e9fe7dd364..c6ff248784 100644
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -93,6 +93,10 @@ def _purge_data(remote):
         '-maxdepth', '2',
         '-type', 'd',
         '-exec', 'umount', '{}', ';',
+        run.Raw('&&'),
+        'sudo', 'umount', '/var/lib/ceph',
+        run.Raw('||'),
+        'true',
         run.Raw(';'),
         'sudo',
         'rm', '-rf', '--one-file-system', '--', '/var/lib/ceph',