Bug 2226 - ClusterConfigurator échoue sur physix88 (can't resolve hostname)
- 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_<app>" - 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.
This commit is contained in:
parent
05d21bc427
commit
c4cf33ac38
8
Util.py
8
Util.py
|
@ -63,15 +63,15 @@ def executeCommand(command):
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
def executeCommandOn(strTargetMachineName, strCommand):
|
def executeCommandOn(target_machine_fqdn, strCommand):
|
||||||
"""
|
"""
|
||||||
execute command on a local or remote machine (using ssh then)
|
execute command on a local or remote machine (using ssh then)
|
||||||
"""
|
"""
|
||||||
# print("comparing %s and %s" % (Lib.Util.getHostName(), strTargetMachineName))
|
print("comparing %s and %s" % (getHostName(), target_machine_fqdn.split('.')[0]))
|
||||||
if getHostName() == strTargetMachineName:
|
if getHostName() == target_machine_fqdn.split('.')[0]:
|
||||||
return executeCommand(strCommand)
|
return executeCommand(strCommand)
|
||||||
else:
|
else:
|
||||||
return executeProgram(['ssh', strTargetMachineName, "%s" % strCommand])
|
return executeProgram(['ssh', target_machine_fqdn, "%s" % strCommand])
|
||||||
|
|
||||||
|
|
||||||
def getUpsStatus():
|
def getUpsStatus():
|
||||||
|
|
Loading…
Reference in New Issue