From: Lukas Stockner <lstockner@genesiscloud.com>
Date: Mon, 25 Jan 2021 23:58:19 +0000 (+0100)
Subject: python-common/drivegroups: avoid dropping "rotational: 0" from DeviceSelection
X-Git-Tag: v16.2.0~230^2~50
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b19eb5bacc5b89a876c46dc4ec75fe7a0352df16;p=ceph.git

python-common/drivegroups: avoid dropping "rotational: 0" from DeviceSelection

False is a legitimate value for the rotational setting and should be included in the JSON output, only None should be ignored.

Fixes: http://tracker.ceph.com/issues/49014
Fixes: cd6a488ab2ca036dd4fb36751b938f605e97e1c8
Signed-off-by: Lukas Stockner <lstockner@genesiscloud.com>
(cherry picked from commit c32f6f5448e51d3196f7a2644ea97ecd22a04f92)
---

diff --git a/src/python-common/ceph/deployment/drive_group.py b/src/python-common/ceph/deployment/drive_group.py
index 86c229bed68de..404ea6ed89dbb 100644
--- a/src/python-common/ceph/deployment/drive_group.py
+++ b/src/python-common/ceph/deployment/drive_group.py
@@ -98,7 +98,7 @@ class DeviceSelection(object):
             ret['vendor'] = self.vendor
         if self.size:
             ret['size'] = self.size
-        if self.rotational:
+        if self.rotational is not None:
             ret['rotational'] = self.rotational
         if self.limit:
             ret['limit'] = self.limit