Introduce RQD_TAGS for setting tags to RQD host. (#875)

AcademySoftwareFoundation · Jan 22, 2021 · 7341f82 · 7341f82
1 parent bf128e4
commit 7341f82
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/rqd/rqd/rqconstants.py b/rqd/rqd/rqconstants.py
@@ -68,6 +68,7 @@
 RQD_USE_IP_AS_HOSTNAME = True
 RQD_BECOME_JOB_USER = True
 RQD_CREATE_USER_IF_NOT_EXISTS = True
+RQD_TAGS = ''
 
 KILL_SIGNAL = 9
 if platform.system() == 'Linux':
@@ -188,6 +189,8 @@
  RQD_USE_IP_AS_HOSTNAME = config.getboolean(__section, "RQD_USE_IP_AS_HOSTNAME")
  if config.has_option(__section, "RQD_BECOME_JOB_USER"):
  RQD_BECOME_JOB_USER = config.getboolean(__section, "RQD_BECOME_JOB_USER")
+ if config.has_option(__section, "RQD_TAGS"):
+ RQD_TAGS = config.getint(__section, "RQD_TAGS")
  if config.has_option(__section, "DEFAULT_FACILITY"):
  DEFAULT_FACILITY = config.get(__section, "DEFAULT_FACILITY")
  if config.has_option(__section, "LAUNCH_FRAME_USER_GID"):

diff --git a/rqd/rqd/rqmachine.py b/rqd/rqd/rqmachine.py
@@ -385,6 +385,10 @@ def __initMachineTags(self):
  """Sets the hosts tags"""
  self.__renderHost.tags.append("rqdv-%s" % rqd.rqconstants.VERSION)
 
+ if rqd.rqconstants.RQD_TAGS:
+ for tag in rqd.rqconstants.RQD_TAGS.split():
+ self.__renderHost.tags.append(tag)
+
  # Tag with desktop if it is a desktop
  if self.isDesktop():
  self.__renderHost.tags.append("desktop")

diff --git a/rqd/tests/rqmachine_tests.py b/rqd/tests/rqmachine_tests.py
@@ -430,6 +430,13 @@ def test_reserveHT(self):
 
  self.assertEqual({0, 1, 2, 3, 4, 5, 6, 7}, self.machine._Machine__tasksets)
 
+ def test_tags(self):
+ tags = ["test1", "test2", "test3"]
+ rqd.rqconstants.RQD_TAGS = " ".join(tags)
+
+ machine = rqd.rqmachine.Machine(self.rqCore, self.coreDetail)
+
+ self.assertTrue(all(tag in machine.__dict__['_Machine__renderHost'].tags for tag in tags))
 
 class CpuinfoTests(unittest.TestCase):