Merge PR ceph#37214 into master

* refs/pull/37214/head: mgr/volumes/nfs: Check if orchestrator spec service_id is valid Reviewed-by: Patrick Donnelly <[email protected]>
senax · Sep 19, 2020 · 0275e1c · 0275e1c
2 parents 22b3d48 + db7353b
commit 0275e1c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/pybind/mgr/volumes/fs/nfs.py b/src/pybind/mgr/volumes/fs/nfs.py
@@ -29,7 +29,8 @@ def available_clusters(mgr):
     completion = mgr.describe_service(service_type='nfs')
     mgr._orchestrator_wait([completion])
     orchestrator.raise_if_exception(completion)
-    return [cluster.spec.service_id.replace('ganesha-', '', 1) for cluster in completion.result]
+    return [cluster.spec.service_id.replace('ganesha-', '', 1) for cluster in completion.result
+            if cluster.spec.service_id]
 
 
 def export_cluster_checker(func):