From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2021 18:07:19 +0000 (-0400)
Subject: mgr/cephadm/inventory: fix deleted check
X-Git-Tag: v16.2.5~87^2~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85fec9611b579b7cf3cc129fa58cb63a051446b4;p=ceph.git

mgr/cephadm/inventory: fix deleted check

Look in dict, not encoded JSON string

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a282c3c249fcd901bf8005f9f8e581ceb0ff6225)
---

diff --git a/src/pybind/mgr/cephadm/inventory.py b/src/pybind/mgr/cephadm/inventory.py
index 7b77e223abfb..adc2a884de59 100644
--- a/src/pybind/mgr/cephadm/inventory.py
+++ b/src/pybind/mgr/cephadm/inventory.py
@@ -167,7 +167,7 @@ class SpecStore():
                 self._specs[service_name] = spec
                 self.spec_created[service_name] = created
 
-                if 'deleted' in v:
+                if 'deleted' in j:
                     deleted = str_to_datetime(cast(str, j['deleted']))
                     self.spec_deleted[service_name] = deleted