From: Sage Weil <sage@inktank.com>
Date: Thu, 7 Mar 2013 00:54:32 +0000 (-0800)
Subject: osd: fix --dmcrypt-key-dir thing
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b2e7dbca99d6594ebec59a8061686d7a7234910;p=ceph-deploy.git

osd: fix --dmcrypt-key-dir thing

Fixes: #4362
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index 03452fb..38daaa2 100644
--- a/ceph_deploy/osd.py
+++ b/ceph_deploy/osd.py
@@ -99,9 +99,9 @@ def prepare_disk(cluster, disk, journal, activate, zap, dmcrypt, dmcrypt_dir):
         args.append('--zap-disk')
     if dmcrypt:
         args.append('--dmcrypt')
-    if dmcrypt_dir is not None:
-        args.append('--dmcrypt-key-dir')
-        args.append(dmcrypt_dir)
+        if dmcrypt_dir is not None:
+            args.append('--dmcrypt-key-dir')
+            args.append(dmcrypt_dir)
     args.extend([
             '--',
             disk,