Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / lib / runtime.py

diff --git a/lib/runtime.py b/lib/runtime.py
index 69b259f..bb586f1 100644 (file)
--- a/lib/runtime.py
+++ b/lib/runtime.py
@@ -75,8 +75,8 @@ class GetentResolver:
   @ivar masterd_gid: The resolved gid of the masterd group
   @ivar confd_uid: The resolved uid of the confd user
   @ivar confd_gid: The resolved gid of the confd group
-  @ivar queryd_uid: The resolved uid of the queryd user
-  @ivar queyrd_gid: The resolved gid of the queyrd group
+  @ivar luxid_uid: The resolved uid of the luxid user
+  @ivar luxid_gid: The resolved gid of the luxid group
   @ivar rapi_uid: The resolved uid of the rapi user
   @ivar rapi_gid: The resolved gid of the rapi group
   @ivar noded_uid: The resolved uid of the noded user
@@ -95,8 +95,8 @@ class GetentResolver:
     self.confd_uid = GetUid(constants.CONFD_USER, _getpwnam)
     self.confd_gid = GetGid(constants.CONFD_GROUP, _getgrnam)
 
-    self.queryd_uid = GetUid(constants.QUERYD_USER, _getpwnam)
-    self.queryd_gid = GetGid(constants.QUERYD_GROUP, _getgrnam)
+    self.luxid_uid = GetUid(constants.LUXID_USER, _getpwnam)
+    self.luxid_gid = GetGid(constants.LUXID_GROUP, _getgrnam)
 
     self.rapi_uid = GetUid(constants.RAPI_USER, _getpwnam)
     self.rapi_gid = GetGid(constants.RAPI_GROUP, _getgrnam)
@@ -104,6 +104,9 @@ class GetentResolver:
     self.noded_uid = GetUid(constants.NODED_USER, _getpwnam)
     self.noded_gid = GetGid(constants.NODED_GROUP, _getgrnam)
 
+    self.mond_uid = GetUid(constants.MOND_USER, _getpwnam)
+    self.mond_gid = GetGid(constants.MOND_GROUP, _getgrnam)
+
     # Misc Ganeti groups
     self.daemons_gid = GetGid(constants.DAEMONS_GROUP, _getgrnam)
     self.admin_gid = GetGid(constants.ADMIN_GROUP, _getgrnam)
@@ -111,17 +114,19 @@ class GetentResolver:
     self._uid2user = {
       self.masterd_uid: constants.MASTERD_USER,
       self.confd_uid: constants.CONFD_USER,
-      self.queryd_uid: constants.QUERYD_USER,
+      self.luxid_uid: constants.LUXID_USER,
       self.rapi_uid: constants.RAPI_USER,
       self.noded_uid: constants.NODED_USER,
+      self.mond_uid: constants.MOND_USER,
       }
 
     self._gid2group = {
       self.masterd_gid: constants.MASTERD_GROUP,
       self.confd_gid: constants.CONFD_GROUP,
-      self.queryd_gid: constants.QUERYD_GROUP,
+      self.luxid_gid: constants.LUXID_GROUP,
       self.rapi_gid: constants.RAPI_GROUP,
       self.noded_gid: constants.NODED_GROUP,
+      self.mond_gid: constants.MOND_GROUP,
       self.daemons_gid: constants.DAEMONS_GROUP,
       self.admin_gid: constants.ADMIN_GROUP,
       }