From c4cf33ac38f46f15ca3c0b000e14aa9fa4db8d4c Mon Sep 17 00:00:00 2001 From: Guillaume Raffy Date: Mon, 16 Apr 2018 09:53:40 +0000 Subject: [PATCH] =?UTF-8?q?Bug=202226=20-=20ClusterConfigurator=20=C3=A9ch?= =?UTF-8?q?oue=20sur=20physix88=20(can't=20resolve=20hostname)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixed bug introduced recently where the name of the machine was used instead of its fully qualified domain name. This caused ClusetrConfigurator to fail on exec nodes Bug 2230 - Unifier les flags de ressource gridengine en supprimant les ressources "has_" - migrated the following complexes: - has_matlab2011b -> matlab_version - has_dsmcmodfoam -> dsmcmodfoam_version - has_meep -> meep_version - openfoam_version (int encoding) -> openfoam_version (float encoding) - also disabled obsolete resources (has_molpro2006 and has_molpro2010) on physix as they've been replaced with the better molpro_version. --- Util.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Util.py b/Util.py index 7bff2d0..5bad141 100644 --- a/Util.py +++ b/Util.py @@ -63,15 +63,15 @@ def executeCommand(command): return result -def executeCommandOn(strTargetMachineName, strCommand): +def executeCommandOn(target_machine_fqdn, strCommand): """ execute command on a local or remote machine (using ssh then) """ - # print("comparing %s and %s" % (Lib.Util.getHostName(), strTargetMachineName)) - if getHostName() == strTargetMachineName: + print("comparing %s and %s" % (getHostName(), target_machine_fqdn.split('.')[0])) + if getHostName() == target_machine_fqdn.split('.')[0]: return executeCommand(strCommand) else: - return executeProgram(['ssh', strTargetMachineName, "%s" % strCommand]) + return executeProgram(['ssh', target_machine_fqdn, "%s" % strCommand]) def getUpsStatus():