From: Sage Weil <sage@inktank.com>
Date: Sun, 22 Jul 2012 03:18:24 +0000 (-0700)
Subject: ceph: fix mkfs/mount option defaults
X-Git-Tag: 1.1.0~2491
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f70b825042fb5d90487570809e3678969e8c8161;p=teuthology.git

ceph: fix mkfs/mount option defaults

Later code expects a list, not None.
---

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 9f6f97134..9d6df4ff8 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -636,6 +636,10 @@ def cluster(ctx, config):
                     if mount_options is None:
                         mount_options = ['noatime','user_xattr']
 
+                if mount_options is None:
+                    mount_options = []
+                if mkfs_options is None:
+                    mkfs_options = []
                 mkfs = ['mkfs.%s' % fs] + mkfs_options
                 log.info('%s on %s on %s' % (mkfs, dev, remote))
                 if package is not None: