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 <pcuzner@redhat.com>
(cherry picked from commit 6a076046060943ddb62dfbb5e3ab168fbbc7fae8)

diff --git a/src/python-common/ceph/deployment/hostspec.py b/src/python-common/ceph/deployment/hostspec.py
index 8fc122531ebb4541a08702f6688045de9ef63ae3..c5ab864182f86011a43dc08f100e8c2dbf363394 100644 (file)
--- 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):