Introduce OVERRIDE_HOSTNAME in RQD for manually settings a hostname. (#849)

Author: splhack

rqd/rqd/rqconstants.py

@@ -114,6 +114,7 @@
 OVERRIDE_PROCS = None # number of physical cpus. ex: None or 2
 OVERRIDE_MEMORY = None # in Kb
 OVERRIDE_NIMBY = None # True to turn on, False to turn off
+OVERRIDE_HOSTNAME = None # Force to use this hostname
 ALLOW_GPU = False
 ALLOW_PLAYBLAST = False
 LOAD_MODIFIER = 0 # amount to add/subtract from load
@@ -175,6 +176,8 @@
             CUEBOT_HOSTNAME = config.get(__section, "OVERRIDE_CUEBOT")
         if config.has_option(__section, "OVERRIDE_NIMBY"):
             OVERRIDE_NIMBY = config.getboolean(__section, "OVERRIDE_NIMBY")
+        if config.has_option(__section, "OVERRIDE_HOSTNAME"):
+            OVERRIDE_HOSTNAME = config.get(__section, "OVERRIDE_HOSTNAME")
         if config.has_option(__section, "GPU"):
             ALLOW_GPU = config.getboolean(__section, "GPU")
         if config.has_option(__section, "PLAYBLAST"):

rqd/rqd/rqutil.py

@@ -149,7 +149,9 @@ def getHostIp():
 def getHostname():
     """Returns the machine's fully qualified domain name"""
     try:
-        if rqd.rqconstants.RQD_USE_IP_AS_HOSTNAME:
+        if rqd.rqconstants.OVERRIDE_HOSTNAME:
+            return rqd.rqconstants.OVERRIDE_HOSTNAME
+        elif rqd.rqconstants.RQD_USE_IP_AS_HOSTNAME:
             return getHostIp()
         else:
             return socket.gethostbyaddr(socket.gethostname())[0].split('.')[0]