From: Sage Weil <sage@redhat.com>
Date: Sun, 1 Mar 2020 17:30:38 +0000 (-0600)
Subject: mgr/rook: use spec.placement.count (instead of spec.count)
X-Git-Tag: v15.1.1~170^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=157e4eb8321f2b359a052e186088d5df68f62bf2;p=ceph.git

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 f2216d5ad4cd..f678aea87823 100644
--- 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 2fc0d4836dc5..dd107046bcad 100644
--- 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
                 )
             )
         )