Merge pull request ceph#61389 from Kushal-deb/fix-issue-69435_NVMe-of_service

mgr/cephadm: Abort nvme deployment with pool that doesn't exist

Reviewed-by: Adam King <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/module.py

@@ -37,7 +37,8 @@
     ServiceSpec, PlacementSpec, \
     HostPlacementSpec, IngressSpec, \
     TunedProfileSpec, \
-    MgmtGatewaySpec
+    MgmtGatewaySpec, \
+    NvmeofServiceSpec
 from ceph.utils import str_to_datetime, datetime_to_str, datetime_now
 from cephadm.serve import CephadmServe
 from cephadm.services.cephadmservice import CephadmDaemonDeploySpec
@@ -3391,6 +3392,15 @@ def _apply_service_spec(self, spec: ServiceSpec) -> str:
             if not mgmt_gw_daemons:
                 raise OrchestratorError("The 'oauth2-proxy' service depends on the 'mgmt-gateway' service, but it is not configured.")
 
+        if spec.service_type == 'nvmeof':
+            spec = cast(NvmeofServiceSpec, spec)
+            assert spec.pool is not None, "Pool cannot be None for nvmeof services"
+            try:
+                self._check_pool_exists(spec.pool, spec.service_name())
+            except OrchestratorError as e:
+                self.log.debug(f"{e}")
+                raise
+
         if spec.placement.count is not None:
             if spec.service_type in ['mon', 'mgr']:
                 if spec.placement.count > max(5, host_count):