]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook: Fix error creating OSDs
authorJuan Miguel Olmo Martínez <jolmomar@redhat.com>
Fri, 3 Jul 2020 11:06:07 +0000 (13:06 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 15 Jul 2020 08:53:03 +0000 (10:53 +0200)
https://github.com/ceph/ceph/pull/34860 broke Rook Integration tests (Rook orchestrator module)

This fix the error that can be seen in:
https://jenkins.rook.io/blue/rest/organizations/jenkins/pipelines/rook/pipelines/rook/branches/master/runs/2046/nodes/63/steps/121/log/?start=0

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 9fd4b481fc4d18e9794806167588d6c6cb1aa46a)

src/pybind/mgr/rook/module.py

index 4b12d8e781a1834688d57a6ece0205de7733ad35..64fcff99c8d90ee81d45ae57789e131113308250 100644 (file)
@@ -493,8 +493,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
 
         def execute(all_hosts_):
             # type: (List[orchestrator.HostSpec]) -> orchestrator.Completion
-            all_hosts = [h.hostname for h in all_hosts_]
-            matching_hosts = drive_group.placement.filter_matching_hosts(lambda label=None, as_hostspec=None: all_hosts)
+            matching_hosts = drive_group.placement.filter_matching_hosts(lambda label=None, as_hostspec=None: all_hosts_)
 
             assert len(matching_hosts) == 1