mgr/cephadm: conflict resolution for cephadm NFS BYOK support 8.1z1

Signed-off-by: Adam King <[email protected]>

Resolves: rhbz#2373703

Author: adk3798

src/pybind/mgr/cephadm/services/nfs.py

@@ -72,15 +72,16 @@ def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonD
     def get_daemon_nodeid(self, service_name: str, rank: Optional[int]) -> str:
         out = self.mgr.get_store('nfs_services_with_old_nodeid')
         if out and service_name in out.split(','):
-                return f'{service_name}.{rank}'
+            return f'{service_name}.{rank}'
         return str(rank)
 
     @classmethod
     def get_dependencies(
         cls,
         mgr: "CephadmOrchestrator",
         spec: Optional[ServiceSpec] = None,
-        daemon_type: Optional[str] = None
+        daemon_type: Optional[str] = None,
+        hostname: Optional[str] = None
     ) -> List[str]:
         deps: List[str] = []
         if not spec:

src/pybind/mgr/cephadm/tests/test_services.py

@@ -3747,8 +3747,6 @@ def test_nfs_config_bind_addr(self, _run_cephadm, cephadm_module: CephadmOrchest
                 ganesha_conf = nfs_generated_conf['files']['ganesha.conf']
                 assert "Bind_addr = 1.2.3.7" in ganesha_conf
 
-
-class TestNFS:
     @patch("cephadm.serve.CephadmServe._run_cephadm")
     @patch("cephadm.services.nfs.NFSService.fence_old_ranks", MagicMock())
     @patch("cephadm.services.nfs.NFSService.run_grace_tool", MagicMock())

src/pybind/mgr/nfs/cluster.py

@@ -196,11 +196,11 @@ def create_nfs_cluster(
                     virtual_ip,
                     ingress_mode,
                     port,
+                    enable_virtual_server,
                     kmip_cert,
                     kmip_key,
                     kmip_ca_cert,
                     kmip_host_list,
-                    enable_virtual_server
                 )
                 return
             raise NonFatalError(f"{cluster_id} cluster already exists")