From: David Galloway <dgallowa@redhat.com>
Date: Thu, 5 Oct 2017 17:36:46 +0000 (-0400)
Subject: internal: Be okay with an empty /var/lib/ceph dir
X-Git-Tag: 1.1.0~386^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1117%2Fhead;p=teuthology.git

internal: Be okay with an empty /var/lib/ceph dir

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

diff --git a/teuthology/task/internal/__init__.py b/teuthology/task/internal/__init__.py
index 2e16423ad..747b8936e 100644
--- a/teuthology/task/internal/__init__.py
+++ b/teuthology/task/internal/__init__.py
@@ -252,11 +252,11 @@ def serialize_remote_roles(ctx, config):
 
 def check_ceph_data(ctx, config):
     """
-    Check for old /var/lib/ceph directories and detect staleness.
+    Check for old /var/lib/ceph subdirectories and detect staleness.
     """
-    log.info('Checking for old /var/lib/ceph...')
+    log.info('Checking for non-empty /var/lib/ceph...')
     processes = ctx.cluster.run(
-        args=['test', '!', '-e', '/var/lib/ceph'],
+        args='test -z $(ls -A /var/lib/ceph)',
         wait=False,
     )
     failed = False