From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 18 Sep 2018 18:06:19 +0000 (-0400)
Subject: ceph-volume lvm.prepare report back when --journal is not used when --filestore is set
X-Git-Tag: v13.2.2~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e35e6df7d7b0066f09e14a4d8c8621ef3a78b91;p=ceph.git

ceph-volume lvm.prepare report back when --journal is not used when --filestore is set

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 2fc1ee48ac10bd8008ff5d54382db1d83e57ec1b)
---

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index f31405ddf56..6833ab5f844 100644
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -335,6 +335,11 @@ class Prepare(object):
             return
         exclude_group_options(parser, argv=self.argv, groups=['filestore', 'bluestore'])
         args = parser.parse_args(self.argv)
+        # the unfortunate mix of one superset for both filestore and bluestore
+        # makes this validation cumbersome
+        if args.filestore:
+            if not args.journal:
+                raise SystemExit('--journal is required when using --filestore')
         # Default to bluestore here since defaulting it in add_argument may
         # cause both to be True
         if not args.bluestore and not args.filestore: