From: Adam King <adking@redhat.com>
Date: Fri, 5 Mar 2021 15:10:25 +0000 (-0500)
Subject: mgr/cephadm: remove duplicate labels when adding a host
X-Git-Tag: v16.2.0~106^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f99bcceaaddc81efe617e067e68321cc66ddd440;p=ceph.git

mgr/cephadm: remove duplicate labels when adding a host

Fixes: https://tracker.ceph.com/issues/49626

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 030fb9d30fbd0b6914ee1ec8283fe7618ed1b8a5)
---

diff --git a/src/python-common/ceph/deployment/hostspec.py b/src/python-common/ceph/deployment/hostspec.py
index 714b8536e4eb..f15272d5f37e 100644
--- a/src/python-common/ceph/deployment/hostspec.py
+++ b/src/python-common/ceph/deployment/hostspec.py
@@ -32,7 +32,7 @@ class HostSpec(object):
         return {
             'hostname': self.hostname,
             'addr': self.addr,
-            'labels': self.labels,
+            'labels': list(set((self.labels))),
             'status': self.status,
         }
 
@@ -40,7 +40,7 @@ class HostSpec(object):
     def from_json(cls, host_spec: dict) -> 'HostSpec':
         _cls = cls(host_spec['hostname'],
                    host_spec['addr'] if 'addr' in host_spec else None,
-                   host_spec['labels'] if 'labels' in host_spec else None,
+                   list(set(host_spec['labels'])) if 'labels' in host_spec else None,
                    host_spec['status'] if 'status' in host_spec else None)
         return _cls