summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris MacNaughton <chris.macnaughton@canonical.com>2017-08-14 15:23:18 +0200
committerChris MacNaughton <chris.macnaughton@canonical.com>2017-08-14 15:25:36 +0200
commitd245f2ca415b7cfdbce1b84919586038dffd22dc (patch)
treefebfe7bf604f0fcc37c78eed89ed932d98c1cd96
parentdd978b7bd0e14efafa585871c48244d57660309a (diff)
explicitly select filestore after default change
In Luminous, Ceph changes the default OSD store to bluestore so we want to change this to handle the change by making the OSD store explicit Change-Id: I2f89f47458b432fe54d9be943481845135fc8e69
Notes
Notes (review): Code-Review+1: Pete Vander Giessen <pete.vandergiessen@canonical.com> Code-Review+1: Edward Hope-Morley <edward.hope-morley@canonical.com> Code-Review+2: Ryan Beisner <ryan.beisner@canonical.com> Workflow+1: Ryan Beisner <ryan.beisner@canonical.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 15 Aug 2017 14:11:57 +0000 Reviewed-on: https://review.openstack.org/493540 Project: openstack/charms.ceph Branch: refs/heads/master
-rw-r--r--ceph/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ceph/utils.py b/ceph/utils.py
index b96dabb..02922d4 100644
--- a/ceph/utils.py
+++ b/ceph/utils.py
@@ -1405,6 +1405,8 @@ def osdize_dev(dev, osd_format, osd_journal, reformat_osd=False,
1405 # NOTE(jamespage): enable experimental bluestore support 1405 # NOTE(jamespage): enable experimental bluestore support
1406 if cmp_pkgrevno('ceph', '10.2.0') >= 0 and bluestore: 1406 if cmp_pkgrevno('ceph', '10.2.0') >= 0 and bluestore:
1407 cmd.append('--bluestore') 1407 cmd.append('--bluestore')
1408 elif cmp_pkgrevno('ceph', '12.1.0') >= 0 and not bluestore:
1409 cmd.append('--filestore')
1408 1410
1409 cmd.append(dev) 1411 cmd.append(dev)
1410 1412