From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 21:49:18 +0000 (-0600)
Subject: mgr/cephadm: fix NodePlacement host names
X-Git-Tag: v15.1.1~282^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20c15b37138eb2f030131fd3e439e28a1e508e0f;p=ceph.git

mgr/cephadm: fix NodePlacement host names

This broke back in 82e4f1e0f1332f7d4f27dd0f83d394a6f14c6bd2, I think.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 12986a2a52dc5..e053b31803fcc 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2576,7 +2576,7 @@ class HostAssignment(object):
         if not self.spec.placement.label and not self.spec.placement.hosts and self.spec.placement.count:
             logger.info("Found num spec. Looking for labeled hosts.")
             # TODO: actually query for labels (self.daemon_type)
-            candidates = self.scheduler.place([x[0] for x in self.get_hosts_func()],
+            candidates = self.scheduler.place([x for x in self.get_hosts_func()],
                                               count=self.spec.placement.count)
             # Not enough hosts to deploy on
             if len(candidates) != self.spec.placement.count:
@@ -2588,7 +2588,7 @@ class HostAssignment(object):
                 self.spec.placement.set_hosts(candidates)
                 return None
 
-            candidates = self.scheduler.place([x[0] for x in self.get_hosts_func()], count=self.spec.placement.count)
+            candidates = self.scheduler.place([x for x in self.get_hosts_func()], count=self.spec.placement.count)
             # Not enough hosts to deploy on
             if len(candidates) != self.spec.placement.count:
                 raise OrchestratorValidationError("Cannot place {} daemons on {} hosts.".