From: Paul Cuzner Date: Wed, 13 Jan 2021 21:49:24 +0000 (+1300) Subject: mgr/orchestrator: ensure appley spec honors maintenance mode X-Git-Tag: v16.2.0~230^2~52 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=debe2beffa7af2418d3f2d46b2679dd4b660c248;p=ceph.git mgr/orchestrator: ensure appley spec honors maintenance mode Add the status field to the definition of the host to ensure an apply_spec honours hosts that should be defined in maintenance during a bootstrap based deployment. Signed-off-by: Paul Cuzner (cherry picked from commit 6a076046060943ddb62dfbb5e3ab168fbbc7fae8) --- diff --git a/src/python-common/ceph/deployment/hostspec.py b/src/python-common/ceph/deployment/hostspec.py index 8fc122531ebb..c5ab864182f8 100644 --- a/src/python-common/ceph/deployment/hostspec.py +++ b/src/python-common/ceph/deployment/hostspec.py @@ -40,7 +40,8 @@ class HostSpec(object): def from_json(cls, host_spec): _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) + host_spec['labels'] if 'labels' in host_spec else None, + host_spec['status'] if 'status' in host_spec else None) return _cls def __repr__(self):