Merge pull request #7149 from fstagni/cherry-pick-2-2bb75a6cb-integration

[sweep:integration] Do not overwrite the tornado port if already set

Author: fstagni

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

@@ -2432,7 +2432,13 @@ def addTornadoOptionsToCS(self, gConfig_o):
             return S_ERROR(f"{instanceOption} not defined in {self.cfgFile}")
         tornadoSection = cfgPath("Systems", "Tornado", compInstance)
 
-        cfg = self.__getCfg(tornadoSection, "Port", 8443)
+        if gConfig_o:
+            tornadoPort = gConfig_o.getValue(cfgPath(tornadoSection, "Port"), "8443")
+        else:
+            tornadoPort = self.localCfg.getOption(cfgPath(tornadoSection, "Port"), "8443")
+
+        cfg = self.__getCfg(tornadoSection, "Port", tornadoPort)
+
         return self._addCfgToCS(cfg)
 
     def setupTornadoService(self, system, component):