]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: "addr" is optional for constructing InventoryNode 33347/head
authorKefu Chai <kchai@redhat.com>
Sat, 15 Feb 2020 03:36:08 +0000 (11:36 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 15 Feb 2020 10:42:14 +0000 (18:42 +0800)
this addresses a regression introduced by 5276871e15

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/orchestrator.py

index f098cf759d1de896473f9f0cd411387ef266fd5c..18dc0a1da937ad78231fb840c94765d98c8a269a 100644 (file)
@@ -1487,7 +1487,7 @@ class InventoryNode(object):
         try:
             _data = copy.deepcopy(data)
             name = _data.pop('name')
-            addr = _data.pop('addr') or name
+            addr = _data.pop('addr', None) or name
             devices = inventory.Devices.from_json(_data.pop('devices'))
             if _data:
                 error_msg = 'Unknown key(s) in Inventory: {}'.format(','.join(_data.keys()))