From: Kefu Chai <kchai@redhat.com>
Date: Sat, 15 Feb 2020 03:36:08 +0000 (+0800)
Subject: mgr/orchestrator: "addr" is optional for constructing InventoryNode
X-Git-Tag: v15.1.1~405^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33347%2Fhead;p=ceph.git

mgr/orchestrator: "addr" is optional for constructing InventoryNode

this addresses a regression introduced by 5276871e15

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index f098cf759d1d..18dc0a1da937 100644
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -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()))