From: Tim Serong <tserong@suse.com>
Date: Thu, 28 Nov 2019 05:25:21 +0000 (+1100)
Subject: mgr/orchestrator: set node labels to empty list if none specified
X-Git-Tag: v15.1.0~726^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49659746e2746d5cd930fc20fe4835e975be395c;p=ceph.git

mgr/orchestrator: set node labels to empty list if none specified

f06366836ff tries to ' '.join(node.labels), which raises an exception
if labels is None, so we need to default it to an empty list.

Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 7ddba059ac02..15a417506558 100644
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -1296,6 +1296,8 @@ class InventoryNode(object):
         # type: (str, inventory.Devices, List[str]) -> None
         if devices is None:
             devices = inventory.Devices([])
+        if labels is None:
+            labels = []
         assert isinstance(devices, inventory.Devices)
 
         self.name = name  # unique within cluster.  For example a hostname.