Merge PR ceph#31914 into master

* refs/pull/31914/head: mgr/orchestrator: set node labels to empty list if none specified Reviewed-by: Joshua Schmid <[email protected]> Reviewed-by: Sage Weil <[email protected]> Reviewed-by: Kiefer Chang <[email protected]>
joskid · Nov 28, 2019 · be6dd89 · be6dd89
2 parents 0cde6a0 + 4965974
commit be6dd89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.githubmap b/.githubmap
@@ -108,3 +108,5 @@ mgfritch Michael Fritch <[email protected]>
 xiaoxichen Xiaoxi Chen <[email protected]>
 toabctl Thomas Bechtold <[email protected]>
 dsavineau Dimitri Savineau <[email protected]>
+jschmid1 Joshua Schmid <[email protected]>
+bk201 Kiefer Chang <[email protected]>
diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
@@ -1296,6 +1296,8 @@ def __init__(self, name, devices=None, labels=None):
         # 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.