From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 10 Mar 2020 12:54:08 +0000 (+0100)
Subject: mgr/cephadm: Make sure we don't co-locate the same daemon
X-Git-Tag: v15.1.1~44^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=db2e0b974726992060ee1b11ba83e9335882c110;p=ceph-ci.git

mgr/cephadm: Make sure we don't co-locate the same daemon

Fixes: https://tracker.ceph.com/issues/44397
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/tests/test_scheduling.py b/src/pybind/mgr/cephadm/tests/test_scheduling.py
index abd3b3e4e2d..2235641b5a4 100644
--- a/src/pybind/mgr/cephadm/tests/test_scheduling.py
+++ b/src/pybind/mgr/cephadm/tests/test_scheduling.py
@@ -42,6 +42,15 @@ class NodeAssignmentTest(NamedTuple):
             ],
             ['host1', 'host2', 'host3']
         ),
+        # count that is bigger than the amount of hosts. Truncate to len(hosts)
+        # RGWs should not be co-located to each other.
+        NodeAssignmentTest(
+            'rgw',
+            PlacementSpec(count=4),
+            'host1 host2 host3'.split(),
+            [],
+            ['host1', 'host2', 'host3']
+        ),
         # count + partial host list
         NodeAssignmentTest(
             'mon',