]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
ceph: fix mkfs/mount option defaults
authorSage Weil <sage@inktank.com>
Sun, 22 Jul 2012 03:18:24 +0000 (20:18 -0700)
committerSage Weil <sage@inktank.com>
Sun, 22 Jul 2012 03:18:24 +0000 (20:18 -0700)
Later code expects a list, not None.

teuthology/task/ceph.py

index 9f6f9713461f42a84636348b3859012d0f0922b4..9d6df4ff87707dc5024f6f5bd076ab858e979c3f 100644 (file)
@@ -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: