]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orch: remove extraneous PlacementSpec.validate()
authorMichael Fritch <mfritch@suse.com>
Thu, 30 Apr 2020 00:16:47 +0000 (18:16 -0600)
committerMichael Fritch <mfritch@suse.com>
Tue, 5 May 2020 18:54:45 +0000 (12:54 -0600)
PlacementSpec is being validated during `__init__()`

Signed-off-by: Michael Fritch <mfritch@suse.com>
src/pybind/mgr/orchestrator/module.py

index 9120a5a58b99493b593f4491303b88e9e18535d6..66915c3870d0e3f3df27aecfce8318c860167e21 100644 (file)
@@ -650,8 +650,6 @@ Usage:
             spec = ServiceSpec.from_json(yaml.safe_load(inbuf))
         else:
             placement = PlacementSpec.from_string(placement)
-            placement.validate()
-
             spec = ServiceSpec(daemon_type, placement=placement)
 
         daemon_type = spec.service_type
@@ -857,8 +855,6 @@ Usage:
             specs = [ServiceSpec.from_json(s) for s in content]
         else:
             placement = PlacementSpec.from_string(placement)
-            placement.validate()
-
             specs = [ServiceSpec(service_type, placement=placement, unmanaged=unmanaged)]
 
         completion = self.apply(specs)
@@ -876,11 +872,9 @@ Usage:
                    placement=None,
                    unmanaged=False,
                    inbuf=None):
-        placement = PlacementSpec.from_string(placement)
-        placement.validate()
         spec = ServiceSpec(
             'mds', fs_name,
-            placement=placement,
+            placement=PlacementSpec.from_string(placement),
             unmanaged=unmanaged)
         completion = self.apply_mds(spec)
         self._orchestrator_wait([completion])