diff --git a/.gitignore b/.gitignore index d681b47d26c14dbcd2aae65b2329c9ca93cf84e5..e7bf7551ffe53890e07429917602dcdfc5201a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -124,9 +124,9 @@ /src/mon-collector /src/htools /src/hconfd -/src/hqueryd +/src/hluxid /src/ganeti-confd -/src/ganeti-queryd +/src/ganeti-luxid /src/ganeti-mond /src/rpc-test diff --git a/INSTALL b/INSTALL index 850cffd3fa79f64136e330790a9cf07a9f68a939..ab57ba5b0dfd09a3013e1cd41a327b6d7c696d24 100644 --- a/INSTALL +++ b/INSTALL @@ -178,7 +178,7 @@ Haskell optional features Optionally, more functionality can be enabled if your build machine has a few more Haskell libraries enabled: the ``ganeti-confd`` and -``ganeti-queryd`` daemon (``--enable-confd``) and the monitoring daemon +``ganeti-luxid`` daemon (``--enable-confd``) and the monitoring daemon (``--enable-mond``). The list of extra dependencies for these is: - `hslogger `_, version 1.1 and diff --git a/Makefile.am b/Makefile.am index 4619eb07917129a89a9424a24e3d09c2b3fc2f15..ca62cf000efc2406b93f41e77d83aa0e455d8218 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,7 @@ CLEANFILES = \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ src/ganeti-confd \ - src/ganeti-queryd \ + src/ganeti-luxid \ src/ganeti-mond \ .hpc/*.mix src/*.tix test/hs/*.tix \ doc/hs-lint.html @@ -215,7 +215,7 @@ HS_GENERATED_FILES = if WANT_HTOOLS HS_GENERATED_FILES += $(HS_PROGS) if ENABLE_CONFD -HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hqueryd src/ganeti-queryd +HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid endif if ENABLE_MOND @@ -479,7 +479,7 @@ endif HS_COMPILE_PROGS= \ src/ganeti-mond \ src/hconfd \ - src/hqueryd \ + src/hluxid \ src/rpc-test # All Haskell non-test programs to be compiled but not automatically installed @@ -870,11 +870,11 @@ if ENABLE_CONFD src/ganeti-confd: src/hconfd cp -f $< $@ -src/ganeti-queryd: src/hqueryd +src/ganeti-luxid: src/hluxid cp -f $< $@ nodist_sbin_SCRIPTS += src/ganeti-confd -nodist_sbin_SCRIPTS += src/ganeti-queryd +nodist_sbin_SCRIPTS += src/ganeti-luxid endif if ENABLE_MOND @@ -986,7 +986,7 @@ EXTRA_DIST = \ man_MANS = \ man/ganeti-cleaner.8 \ man/ganeti-confd.8 \ - man/ganeti-queryd.8 \ + man/ganeti-luxid.8 \ man/ganeti-listrunner.8 \ man/ganeti-masterd.8 \ man/ganeti-mond.8 \ @@ -1539,8 +1539,8 @@ lib/_autoconf.py: Makefile | stamp-directories echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \ echo "CONFD_USER = '$(CONFD_USER)'"; \ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ - echo "QUERYD_USER = '$(QUERYD_USER)'"; \ - echo "QUERYD_GROUP = '$(QUERYD_GROUP)'"; \ + echo "LUXID_USER = '$(LUXID_USER)'"; \ + echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_GROUP = '$(NODED_GROUP)'"; \ echo "MOND_USER = '$(MOND_USER)'"; \ @@ -1622,13 +1622,13 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ - echo 's#@''GNTQUERYDUSER@#$(QUERY_USER)#g'; \ + echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ - echo 's#@''GNTQUERYDGROUP@#$(QUERYD_GROUP)#g'; \ + echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ diff --git a/configure.ac b/configure.ac index 1fdb2e4c3d03cb228eadbd1cee986ac307805ce7..e047f1482f4479a7ace3d5a8b078dc00ef128e53 100644 --- a/configure.ac +++ b/configure.ac @@ -243,19 +243,19 @@ AC_ARG_WITH([user-prefix], [user_masterd="${withval}masterd"; user_rapi="${withval}rapi"; user_confd="${withval}confd"; - user_queryd="${withval}queryd"; + user_luxid="${withval}luxid"; user_noded="$user_default"; user_mond="${withval}mond"], [user_masterd="$user_default"; user_rapi="$user_default"; user_confd="$user_default"; - user_queryd="$user_default"; + user_luxid="$user_default"; user_noded="$user_default"; user_mond="$user_default"]) AC_SUBST(MASTERD_USER, $user_masterd) AC_SUBST(RAPI_USER, $user_rapi) AC_SUBST(CONFD_USER, $user_confd) -AC_SUBST(QUERYD_USER, $user_queryd) +AC_SUBST(LUXID_USER, $user_luxid) AC_SUBST(NODED_USER, $user_noded) AC_SUBST(MOND_USER, $user_mond) @@ -269,7 +269,7 @@ AC_ARG_WITH([group-prefix], [group_rapi="${withval}rapi"; group_admin="${withval}admin"; group_confd="${withval}confd"; - group_queryd="${withval}queryd"; + group_luxid="${withval}luxid"; group_masterd="${withval}masterd"; group_noded="$group_default"; group_daemons="${withval}daemons"; @@ -277,7 +277,7 @@ AC_ARG_WITH([group-prefix], [group_rapi="$group_default"; group_admin="$group_default"; group_confd="$group_default"; - group_queryd="$group_default"; + group_luxid="$group_default"; group_masterd="$group_default"; group_noded="$group_default"; group_daemons="$group_default"; @@ -285,7 +285,7 @@ AC_ARG_WITH([group-prefix], AC_SUBST(RAPI_GROUP, $group_rapi) AC_SUBST(ADMIN_GROUP, $group_admin) AC_SUBST(CONFD_GROUP, $group_confd) -AC_SUBST(QUERYD_GROUP, $group_queryd) +AC_SUBST(LUXID_GROUP, $group_luxid) AC_SUBST(MASTERD_GROUP, $group_masterd) AC_SUBST(NODED_GROUP, $group_noded) AC_SUBST(DAEMONS_GROUP, $group_daemons) @@ -295,7 +295,7 @@ AC_SUBST(MOND_GROUP, $group_mond) AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi]) AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd]) -AC_MSG_NOTICE([Running ganeti-queryd as $user_queryd:$group_queryd]) +AC_MSG_NOTICE([Running ganeti-luxid as $user_luxid:$group_luxid]) AC_MSG_NOTICE([Group for daemons is $group_daemons]) AC_MSG_NOTICE([Group for clients is $group_admin]) diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in index 2d11404468b08a5fe8c201cd19bcd03f79593469..89f85c7721243f6dfffd47336fea07adf5f0001a 100644 --- a/daemons/daemon-util.in +++ b/daemons/daemon-util.in @@ -39,7 +39,7 @@ _confd_enabled() { if _confd_enabled; then DAEMONS+=( ganeti-confd ) - DAEMONS+=( ganeti-queryd ) + DAEMONS+=( ganeti-luxid ) fi _mond_enabled() { @@ -53,7 +53,7 @@ fi NODED_ARGS= MASTERD_ARGS= CONFD_ARGS= -QUERYD_ARGS= +LUXID_ARGS= RAPI_ARGS= MOND_ARGS= @@ -84,8 +84,8 @@ _daemon_usergroup() { confd) echo "@GNTCONFDUSER@:@GNTDAEMONSGROUP@" ;; - queryd) - echo "@GNTQUERYDUSER@:@GNTQUERYDGROUP@" + luxid) + echo "@GNTLUXIDUSER@:@GNTLUXIDGROUP@" ;; rapi) echo "@GNTRAPIUSER@:@GNTRAPIGROUP@" @@ -233,7 +233,7 @@ start() { local usergroup=$(_daemon_usergroup $plain_name) local daemonexec=$(_daemon_executable $name) - if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-queryd ]] ) \ + if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-luxid ]] ) \ && ! _confd_enabled; then echo 'ganeti-confd disabled at build time' >&2 return 1 diff --git a/doc/design-query-splitting.rst b/doc/design-query-splitting.rst index 2992f74b407b58323bd88eb647808875811b7392..e0718bcdd34f2407420fd4376dd685f7700c2f32 100644 --- a/doc/design-query-splitting.rst +++ b/doc/design-query-splitting.rst @@ -77,7 +77,7 @@ the instance console), to a split model: - if just masterd is stopped, then other cluster functionality remains available: listing instances, connecting to the console of an instance, etc. -- if just "queryd" is stopped, masterd can still process jobs, and one +- if just "luxid" is stopped, masterd can still process jobs, and one can furthermore run queries from other nodes (MCs) - only if both are stopped, we end up with the previous state @@ -141,12 +141,12 @@ configuration queries. The redirection of Luxi requests can be easily done based on the request type, if we have both sockets open, or if we open on demand. -We don't want the masterd to talk to the queryd itself (hidden +We don't want the masterd to talk to the luxid itself (hidden redirection), since we want to be able to run queries while masterd is down. During the 2.7 release cycle, we can test all queries against both -masterd and queryd in QA, so we know we have exactly the same +masterd and luxid in QA, so we know we have exactly the same interface and it is consistent. .. vim: set textwidth=72 : diff --git a/lib/constants.py b/lib/constants.py index b814ffaddf6fbf73defda127b04a2609d83e88ef..37baba2f1201a183e7ad655f0e9503daa02b47c7 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -104,8 +104,8 @@ RAPI_USER = _autoconf.RAPI_USER RAPI_GROUP = _autoconf.RAPI_GROUP CONFD_USER = _autoconf.CONFD_USER CONFD_GROUP = _autoconf.CONFD_GROUP -QUERYD_USER = _autoconf.QUERYD_USER -QUERYD_GROUP = _autoconf.QUERYD_GROUP +LUXID_USER = _autoconf.LUXID_USER +LUXID_GROUP = _autoconf.LUXID_GROUP NODED_USER = _autoconf.NODED_USER NODED_GROUP = _autoconf.NODED_GROUP MOND_USER = _autoconf.MOND_USER @@ -158,7 +158,7 @@ SCP = "scp" NODED = "ganeti-noded" CONFD = "ganeti-confd" -QUERYD = "ganeti-queryd" +LUXID = "ganeti-luxid" RAPI = "ganeti-rapi" MASTERD = "ganeti-masterd" MOND = "ganeti-mond" @@ -166,7 +166,7 @@ MOND = "ganeti-mond" DAEMONS = compat.UniqueFrozenset([ NODED, CONFD, - QUERYD, + LUXID, RAPI, MASTERD, MOND, @@ -192,7 +192,7 @@ LAST_DRBD_PORT = 14999 DAEMONS_LOGBASE = { NODED: "node-daemon", CONFD: "conf-daemon", - QUERYD: "query-daemon", + LUXID: "query-daemon", RAPI: "rapi-daemon", MASTERD: "master-daemon", MOND: "monitoring-daemon", diff --git a/lib/runtime.py b/lib/runtime.py index 69b259fdffc43704411ae0fddcf75f7f47694e03..c06c493c07946138795d5132f5be08f77042ffa4 100644 --- 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) @@ -111,7 +111,7 @@ 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, } @@ -119,7 +119,7 @@ class GetentResolver: 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.daemons_gid: constants.DAEMONS_GROUP, diff --git a/lib/tools/ensure_dirs.py b/lib/tools/ensure_dirs.py index cebc54f3fd872bb871b84fa22bea7cf7b5074881..f0a442560af78ea1c01facaafb0b076f3316d22a 100644 --- a/lib/tools/ensure_dirs.py +++ b/lib/tools/ensure_dirs.py @@ -180,7 +180,7 @@ def GetPaths(): (pathutils.MASTER_SOCKET, FILE, 0660, getent.masterd_uid, getent.daemons_gid, False), (pathutils.QUERY_SOCKET, FILE, 0660, - getent.queryd_uid, getent.daemons_gid, False), + getent.luxid_uid, getent.daemons_gid, False), (pathutils.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid, getent.masterd_gid), (pathutils.UIDPOOL_LOCKDIR, DIR, 0750, diff --git a/man/ganeti-queryd.rst b/man/ganeti-luxid.rst similarity index 82% rename from man/ganeti-queryd.rst rename to man/ganeti-luxid.rst index de185a07554e003f4120eaa759b69da0a0b5cd54..9487bea983d4abb4a658a2a2d94f98b80509baea 100644 --- a/man/ganeti-queryd.rst +++ b/man/ganeti-luxid.rst @@ -1,20 +1,20 @@ -ganeti-queryd(8) Ganeti | Version @GANETI_VERSION@ -================================================== +ganeti-luxid(8) Ganeti | Version @GANETI_VERSION@ +================================================= Name ---- -ganeti-queryd - Ganeti query daemon +ganeti-luxid - Ganeti query daemon Synopsis -------- -**ganeti-queryd** [-f] [-d] +**ganeti-luxid** [-f] [-d] DESCRIPTION ----------- -**ganeti-queryd** is a daemon used to answer queries related to the +**ganeti-luxid** is a daemon used to answer queries related to the configuration and the current live state of a Ganeti cluster. For testing purposes, you can give the ``-f`` option and the @@ -25,7 +25,7 @@ Debug-level message can be activated by giving the ``-d`` option. Logging to syslog, rather than its own log file, can be enabled by passing in the ``--syslog`` option. -The **ganeti-queryd** daemon listens on a Unix socket +The **ganeti-luxid** daemon listens on a Unix socket (``@LOCALSTATEDIR@/run/ganeti/socket/ganeti-query``) on which it exports a ``Luxi`` endpoint, serving query operations only. Commands and tools use this socket if the build-time option for split queries has been diff --git a/qa/qa_env.py b/qa/qa_env.py index 7c1caeef2ef4348a0a1b0b9b992a6117fc47d003..34445c33ba0defcf205f1aeffe67e68f787b53f6 100644 --- a/qa/qa_env.py +++ b/qa/qa_env.py @@ -54,7 +54,7 @@ def TestGanetiCommands(): ["ganeti-rapi", "--version"], ["ganeti-watcher", "--version"], ["ganeti-confd", "--version"], - ["ganeti-queryd", "--version"], + ["ganeti-luxid", "--version"], ) cmd = " && ".join([utils.ShellQuoteArgs(i) for i in cmds]) diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs index 6d4dd3cd3f7038998919a26c70649a5476795db5..53f0d295012592bc10c9a2f0ff97b4847021a323 100644 --- a/src/Ganeti/Query/Server.hs +++ b/src/Ganeti/Query/Server.hs @@ -239,11 +239,11 @@ listener creader socket = do -- | Type alias for prepMain results type PrepResult = (FilePath, S.Socket, IORef (Result ConfigData)) --- | Check function for queryd. +-- | Check function for luxid. checkMain :: CheckFn () checkMain _ = return $ Right () --- | Prepare function for queryd. +-- | Prepare function for luxid. prepMain :: PrepFn () PrepResult prepMain _ _ = do socket_path <- Path.defaultQuerySocket diff --git a/src/Ganeti/Runtime.hs b/src/Ganeti/Runtime.hs index 2e1a67ef6e86e4a39b59f1043db1d507ad815ab3..bf24e9443e1693353760b488c277fcee865f6e28 100644 --- a/src/Ganeti/Runtime.hs +++ b/src/Ganeti/Runtime.hs @@ -57,7 +57,7 @@ data GanetiDaemon = GanetiMasterd | GanetiNoded | GanetiRapi | GanetiConfd - | GanetiQueryd + | GanetiLuxid | GanetiMond deriving (Show, Enum, Bounded, Eq, Ord) @@ -77,7 +77,7 @@ daemonName GanetiMasterd = C.masterd daemonName GanetiNoded = C.noded daemonName GanetiRapi = C.rapi daemonName GanetiConfd = C.confd -daemonName GanetiQueryd = C.queryd +daemonName GanetiLuxid = C.luxid daemonName GanetiMond = C.mond -- | Returns whether the daemon only runs on the master node. @@ -86,7 +86,7 @@ daemonOnlyOnMaster GanetiMasterd = True daemonOnlyOnMaster GanetiNoded = False daemonOnlyOnMaster GanetiRapi = False daemonOnlyOnMaster GanetiConfd = False -daemonOnlyOnMaster GanetiQueryd = True +daemonOnlyOnMaster GanetiLuxid = True daemonOnlyOnMaster GanetiMond = False -- | Returns the log file base for a daemon. @@ -95,7 +95,7 @@ daemonLogBase GanetiMasterd = C.daemonsLogbaseGanetiMasterd daemonLogBase GanetiNoded = C.daemonsLogbaseGanetiNoded daemonLogBase GanetiRapi = C.daemonsLogbaseGanetiRapi daemonLogBase GanetiConfd = C.daemonsLogbaseGanetiConfd -daemonLogBase GanetiQueryd = C.daemonsLogbaseGanetiQueryd +daemonLogBase GanetiLuxid = C.daemonsLogbaseGanetiLuxid daemonLogBase GanetiMond = C.daemonsLogbaseGanetiMond -- | Returns the configured user name for a daemon. @@ -104,7 +104,7 @@ daemonUser GanetiMasterd = C.masterdUser daemonUser GanetiNoded = C.nodedUser daemonUser GanetiRapi = C.rapiUser daemonUser GanetiConfd = C.confdUser -daemonUser GanetiQueryd = C.querydUser +daemonUser GanetiLuxid = C.luxidUser daemonUser GanetiMond = C.mondUser -- | Returns the configured group for a daemon. @@ -113,7 +113,7 @@ daemonGroup (DaemonGroup GanetiMasterd) = C.masterdGroup daemonGroup (DaemonGroup GanetiNoded) = C.nodedGroup daemonGroup (DaemonGroup GanetiRapi) = C.rapiGroup daemonGroup (DaemonGroup GanetiConfd) = C.confdGroup -daemonGroup (DaemonGroup GanetiQueryd) = C.querydGroup +daemonGroup (DaemonGroup GanetiLuxid) = C.luxidGroup daemonGroup (DaemonGroup GanetiMond) = C.mondGroup daemonGroup (ExtraGroup DaemonsGroup) = C.daemonsGroup daemonGroup (ExtraGroup AdminGroup) = C.adminGroup diff --git a/src/hqueryd.hs b/src/hluxid.hs similarity index 97% rename from src/hqueryd.hs rename to src/hluxid.hs index 100cc14ed98de8cfee8c3edb1d1a6fd767e5ceb9..b4e9e54cf02c5a7c5e45ab3bb21a2b02f61c81f1 100644 --- a/src/hqueryd.hs +++ b/src/hluxid.hs @@ -41,7 +41,7 @@ options = -- | Main function. main :: IO () main = - genericMain GanetiQueryd options + genericMain GanetiLuxid options Ganeti.Query.Server.checkMain Ganeti.Query.Server.prepMain Ganeti.Query.Server.main diff --git a/test/hs/Test/Ganeti/Runtime.hs b/test/hs/Test/Ganeti/Runtime.hs index 8e08e78933299291d522ebc86493384eedc252f7..9c3679b687b304f59db4e8a53c5d0b4b655d6f16 100644 --- a/test/hs/Test/Ganeti/Runtime.hs +++ b/test/hs/Test/Ganeti/Runtime.hs @@ -83,14 +83,14 @@ case_UsersGroups = do \ constants.NODED_USER,\n\ \ constants.RAPI_USER,\n\ \ constants.CONFD_USER,\n\ - \ constants.QUERYD_USER,\n\ + \ constants.LUXID_USER,\n\ \ constants.MOND_USER,\n\ \ ]\n\ \groups = [constants.MASTERD_GROUP,\n\ \ constants.NODED_GROUP,\n\ \ constants.RAPI_GROUP,\n\ \ constants.CONFD_GROUP,\n\ - \ constants.QUERYD_GROUP,\n\ + \ constants.LUXID_GROUP,\n\ \ constants.MOND_GROUP,\n\ \ constants.DAEMONS_GROUP,\n\ \ constants.ADMIN_GROUP,\n\ diff --git a/test/py/daemon-util_unittest.bash b/test/py/daemon-util_unittest.bash index d40a274125cf5464e850c23089fe3fc4c76551fa..ec7b50dfd7ca2fe6b689a499c18a1b45cfaca082 100755 --- a/test/py/daemon-util_unittest.bash +++ b/test/py/daemon-util_unittest.bash @@ -40,8 +40,8 @@ DAEMONS_LIST="noded masterd rapi" STOPDAEMONS_LIST="rapi masterd noded" if grep -q '^ENABLE_CONFD = True' lib/_autoconf.py; then - DAEMONS_LIST="$DAEMONS_LIST confd queryd" - STOPDAEMONS_LIST="queryd confd $STOPDAEMONS_LIST" + DAEMONS_LIST="$DAEMONS_LIST confd luxid" + STOPDAEMONS_LIST="luxid confd $STOPDAEMONS_LIST" fi if grep -q '^ENABLE_MOND = True' lib/_autoconf.py; then diff --git a/tools/users-setup.in b/tools/users-setup.in index 92686b446757cdb70e5a33b47cae7b5a2bd377b8..c9b57089c3f05397e1b3a1c7ba29cab863ac1b07 100644 --- a/tools/users-setup.in +++ b/tools/users-setup.in @@ -7,19 +7,19 @@ addgroup --system @GNTADMINGROUP@ addgroup --system @GNTMASTERUSER@ addgroup --system @GNTRAPIUSER@ addgroup --system @GNTCONFDUSER@ -addgroup --system @GNTQUERYDUSER@ +addgroup --system @GNTLUXIDUSER@ addgroup --system @GNTMONDUSER@ #Create users adduser --system --ingroup @GNTMASTERDGROUP@ @GNTMASTERUSER@ adduser --system --ingroup @GNTRAPIGROUP@ @GNTRAPIUSER@ adduser --system --ingroup @GNTCONFDGROUP@ @GNTCONFDUSER@ -adduser --system --ingroup @GNTQUERYDGROUP@ @GNTQUERYDUSER@ +adduser --system --ingroup @GNTLUXIDGROUP@ @GNTLUXIDUSER@ adduser --system --ingroup @GNTMONDGROUP@ @GNTMONDUSER@ adduser --system @GNTNODEDUSER@ #Add users to extra groups -for u in @GNTMASTERUSER@ @GNTCONFDUSER@ @GNTQUERYDUSER@ @GNTRAPIUSER@ @GNTMONDUSER@ +for u in @GNTMASTERUSER@ @GNTCONFDUSER@ @GNTLUXIDUSER@ @GNTRAPIUSER@ @GNTMONDUSER@ do adduser $u @GNTDAEMONSGROUP@ done @@ -31,5 +31,5 @@ done adduser @GNTMASTERUSER@ @GNTCONFDGROUP@ adduser @GNTMONDUSER@ @GNTMASTERDGROUP@ -adduser @GNTQUERYDUSER@ @GNTMASTERDGROUP@ -adduser @GNTQUERYDUSER@ @GNTCONFDGROUP@ +adduser @GNTLUXIDUSER@ @GNTMASTERDGROUP@ +adduser @GNTLUXIDUSER@ @GNTCONFDGROUP@ diff --git a/tools/vcluster-setup.in b/tools/vcluster-setup.in index da766a9cab345aff7d498a08ca417cd13c891d52..4827cea7c952418e185c3378adb4f875deb0da8d 100644 --- a/tools/vcluster-setup.in +++ b/tools/vcluster-setup.in @@ -203,7 +203,7 @@ NODED_ARGS='--no-mlock $daemon_args' MASTERD_ARGS='' RAPI_ARGS='$daemon_args' CONFD_ARGS='$daemon_args' -QUERYD_ARGS='' +LUXID_ARGS='' export GANETI_ROOTDIR='$nodedir' export GANETI_HOSTNAME='$(node_hostname $number)'