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 e9fe7dd36435e4947b53946c0702992f110d8c6c..c6ff24878447138ca42537547cbcf34fcea29b84 100644 (file)
--- 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',