mgr/rook: use spec.placement.count (instead of spec.count)

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index f2216d5ad4cdf5988440a6e0a8b912a10015dd9e..f678aea8782351758186edb69fd835e2c3ceed62 100644 (file)
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -346,7 +346,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
 
     def apply_mds(self, spec):
         # type: (orchestrator.ServiceSpec) -> RookCompletion
-        num = spec.count
+        num = spec.placement.count
         return write_completion(
             lambda: self.rook_cluster.update_mds_count(spec.service_id, num),
             "Updating MDS server count in {0} to {1}".format(spec.service_id, num),
@@ -355,7 +355,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
 
     def apply_nfs(self, spec):
         # type: (orchestrator.NFSServiceSpec) -> RookCompletion
-        num = spec.count
+        num = spec.placement.count
         return write_completion(
             lambda: self.rook_cluster.update_nfs_count(spec.service_id, num),
             "Updating NFS server count in {0} to {1}".format(spec.service_id, num),

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 2fc0d4836dc55d7cf3ba32b6ac0b13cc5b23ea96..dd107046bcad6f22b9ccf0b6d4dd7502f3990e4b 100644 (file)
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -356,7 +356,7 @@ class RookCluster(object):
             ),
             spec=cfs.Spec(
                 metadataServer=cfs.MetadataServer(
-                    activeCount=spec.count,
+                    activeCount=spec.placement.count,
                     activeStandby=True
                 )
             )
@@ -381,7 +381,7 @@ class RookCluster(object):
                     pool=spec.pool
                 ),
                 server=cnfs.Server(
-                    active=spec.count
+                    active=spec.placement.count
                 )
             )
         )
@@ -416,7 +416,7 @@ class RookCluster(object):
                 gateway=cos.Gateway(
                     type='s3',
                     port=spec.rgw_frontend_port if spec.rgw_frontend_port is not None else 80,
-                    instances=spec.count
+                    instances=spec.placement.count
                 )
             )
         )