]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: useful message when no service type in "ceph orch apply"
authorAdam King <adking@redhat.com>
Wed, 3 Feb 2021 13:14:07 +0000 (08:14 -0500)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 22 Feb 2021 16:34:11 +0000 (17:34 +0100)
Right now it just gives a traceback. A message telling users they have
not provided a proper service type would be more useful

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b68675b516292ed3a2fb7a9377723fe9049b54ea)

src/pybind/mgr/orchestrator/module.py

index 1ed7124068e7632f37ca701e5decc98b3f5e9dc1..54122d4029a814ad3cf4c72a47b2f132c358c7ab 100644 (file)
@@ -1100,7 +1100,8 @@ Usage:
                 specs.append(spec)
         else:
             placementspec = PlacementSpec.from_string(placement)
-            assert service_type
+            if not service_type:
+                raise OrchestratorValidationError(usage)
             specs = [ServiceSpec(service_type.value, placement=placementspec,
                                  unmanaged=unmanaged, preview_only=dry_run)]