]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: ensure appley spec honors maintenance mode 38875/head
authorPaul Cuzner <pcuzner@redhat.com>
Wed, 13 Jan 2021 21:49:24 +0000 (10:49 +1300)
committerPaul Cuzner <pcuzner@redhat.com>
Fri, 22 Jan 2021 04:03:00 +0000 (17:03 +1300)
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 <pcuzner@redhat.com>
src/python-common/ceph/deployment/hostspec.py

index 8fc122531ebb4541a08702f6688045de9ef63ae3..c5ab864182f86011a43dc08f100e8c2dbf363394 100644 (file)
@@ -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):