Revision 14013e5d
b/Makefile.am | ||
---|---|---|
1454 | 1454 |
echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ |
1455 | 1455 |
echo "NODED_USER = '$(NODED_USER)'"; \ |
1456 | 1456 |
echo "NODED_GROUP = '$(NODED_GROUP)'"; \ |
1457 |
echo "MOND_USER = '$(MOND_USER)'"; \ |
|
1458 |
echo "MOND_GROUP = '$(MOND_GROUP)'"; \ |
|
1457 | 1459 |
echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \ |
1458 | 1460 |
echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \ |
1459 | 1461 |
echo "HTOOLS = True"; \ |
... | ... | |
1461 | 1463 |
echo "XEN_CMD = '$(XEN_CMD)'"; \ |
1462 | 1464 |
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ |
1463 | 1465 |
echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \ |
1464 |
echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
|
|
1466 |
echo "ENABLE_MOND = $(ENABLE_MOND)"; \
|
|
1465 | 1467 |
## Write dictionary with man page name as the key and the section number as the |
1466 | 1468 |
## value |
1467 | 1469 |
echo "MAN_PAGES = {"; \ |
... | ... | |
1532 | 1534 |
echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ |
1533 | 1535 |
echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ |
1534 | 1536 |
echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ |
1537 |
echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ |
|
1535 | 1538 |
echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \ |
1536 | 1539 |
echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ |
1537 | 1540 |
echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ |
1538 | 1541 |
echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ |
1542 |
echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ |
|
1539 | 1543 |
echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ |
1540 | 1544 |
echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \ |
1545 |
echo 's#@''CUSTOM_ENABLE_MOND@#$(ENABLE_MOND)#g'; \ |
|
1541 | 1546 |
echo 's#@''MODULES@#$(strip $(lint_python_code))#g'; \ |
1542 | 1547 |
echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \ |
1543 | 1548 |
echo; \ |
b/autotools/build-bash-completion | ||
---|---|---|
859 | 859 |
debug=debug) |
860 | 860 |
|
861 | 861 |
# mon-collector, if monitoring is enabled |
862 |
if _autoconf.ENABLE_MONITORING:
|
|
862 |
if _autoconf.ENABLE_MOND:
|
|
863 | 863 |
WriteHaskellCmdCompletion(sw, "src/mon-collector", debug=debug) |
864 | 864 |
|
865 | 865 |
# Reset extglob to original value |
b/configure.ac | ||
---|---|---|
243 | 243 |
[user_masterd="${withval}masterd"; |
244 | 244 |
user_rapi="${withval}rapi"; |
245 | 245 |
user_confd="${withval}confd"; |
246 |
user_noded="$user_default"], |
|
246 |
user_noded="$user_default"; |
|
247 |
user_mond="${withval}mond"], |
|
247 | 248 |
[user_masterd="$user_default"; |
248 | 249 |
user_rapi="$user_default"; |
249 | 250 |
user_confd="$user_default"; |
250 |
user_noded="$user_default"]) |
|
251 |
user_noded="$user_default"; |
|
252 |
user_mond="$user_default"]) |
|
251 | 253 |
AC_SUBST(MASTERD_USER, $user_masterd) |
252 | 254 |
AC_SUBST(RAPI_USER, $user_rapi) |
253 | 255 |
AC_SUBST(CONFD_USER, $user_confd) |
254 | 256 |
AC_SUBST(NODED_USER, $user_noded) |
257 |
AC_SUBST(MOND_USER, $user_mond) |
|
255 | 258 |
|
256 | 259 |
# --with-group-prefix=... |
257 | 260 |
AC_ARG_WITH([group-prefix], |
... | ... | |
265 | 268 |
group_confd="${withval}confd"; |
266 | 269 |
group_masterd="${withval}masterd"; |
267 | 270 |
group_noded="$group_default"; |
268 |
group_daemons="${withval}daemons";], |
|
271 |
group_daemons="${withval}daemons"; |
|
272 |
group_mond="${withval}mond"], |
|
269 | 273 |
[group_rapi="$group_default"; |
270 | 274 |
group_admin="$group_default"; |
271 | 275 |
group_confd="$group_default"; |
272 | 276 |
group_masterd="$group_default"; |
273 | 277 |
group_noded="$group_default"; |
274 |
group_daemons="$group_default"]) |
|
278 |
group_daemons="$group_default"; |
|
279 |
group_mond="$group_default"]) |
|
275 | 280 |
AC_SUBST(RAPI_GROUP, $group_rapi) |
276 | 281 |
AC_SUBST(ADMIN_GROUP, $group_admin) |
277 | 282 |
AC_SUBST(CONFD_GROUP, $group_confd) |
278 | 283 |
AC_SUBST(MASTERD_GROUP, $group_masterd) |
279 | 284 |
AC_SUBST(NODED_GROUP, $group_noded) |
280 | 285 |
AC_SUBST(DAEMONS_GROUP, $group_daemons) |
286 |
AC_SUBST(MOND_GROUP, $group_mond) |
|
281 | 287 |
|
282 | 288 |
# Print the config to the user |
283 | 289 |
AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) |
... | ... | |
475 | 481 |
[], |
476 | 482 |
[enable_confd=check]) |
477 | 483 |
|
478 |
ENABLE_MONITORING=
|
|
484 |
ENABLE_MOND=
|
|
479 | 485 |
AC_ARG_ENABLE([monitoring], |
480 | 486 |
[AS_HELP_STRING([--enable-monitoring], |
481 | 487 |
[enable the ganeti monitoring agent (default: check)])], |
... | ... | |
573 | 579 |
if test "$has_monitoring" = True; then |
574 | 580 |
AC_MSG_NOTICE([Enabling the monitoring agent usage]) |
575 | 581 |
fi |
576 |
AC_SUBST(ENABLE_MONITORING, $has_monitoring)
|
|
577 |
AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True])
|
|
582 |
AC_SUBST(ENABLE_MOND, $has_monitoring)
|
|
583 |
AM_CONDITIONAL([ENABLE_MOND], [test "$has_monitoring" = True])
|
|
578 | 584 |
|
579 | 585 |
# development modules |
580 | 586 |
HS_NODEV= |
b/lib/constants.py | ||
---|---|---|
106 | 106 |
CONFD_GROUP = _autoconf.CONFD_GROUP |
107 | 107 |
NODED_USER = _autoconf.NODED_USER |
108 | 108 |
NODED_GROUP = _autoconf.NODED_GROUP |
109 |
MOND_USER = _autoconf.MOND_USER |
|
110 |
MOND_GROUP = _autoconf.MOND_GROUP |
|
109 | 111 |
SSH_LOGIN_USER = _autoconf.SSH_LOGIN_USER |
110 | 112 |
SSH_CONSOLE_USER = _autoconf.SSH_CONSOLE_USER |
111 | 113 |
|
Also available in: Unified diff