From 030fb9d30fbd0b6914ee1ec8283fe7618ed1b8a5 Mon Sep 17 00:00:00 2001 From: Adam King Date: Fri, 5 Mar 2021 10:10:25 -0500 Subject: [PATCH] mgr/cephadm: remove duplicate labels when adding a host Fixes: https://tracker.ceph.com/issues/49626 Signed-off-by: Adam King --- src/python-common/ceph/deployment/hostspec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python-common/ceph/deployment/hostspec.py b/src/python-common/ceph/deployment/hostspec.py index 714b8536e4e..f15272d5f37 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