Revision cd8b0072
b/Makefile.am | ||
---|---|---|
1003 | 1003 |
else \ |
1004 | 1004 |
echo "HTOOLS = False"; \ |
1005 | 1005 |
fi; \ |
1006 |
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ |
|
1006 | 1007 |
} > $@ |
1007 | 1008 |
|
1008 | 1009 |
lib/_vcsversion.py: Makefile vcs-version | lib/.dir |
... | ... | |
1054 | 1055 |
echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ |
1055 | 1056 |
echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ |
1056 | 1057 |
echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ |
1058 |
echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \ |
|
1057 | 1059 |
} > $@ |
1058 | 1060 |
|
1059 | 1061 |
# Using deferred evaluation |
b/configure.ac | ||
---|---|---|
261 | 261 |
[], |
262 | 262 |
[enable_htools_rapi=no]) |
263 | 263 |
|
264 |
# --enable-htools |
|
265 |
ENABLE_CONFD= |
|
266 |
AC_ARG_ENABLE([confd], |
|
267 |
[AS_HELP_STRING([--enable-confd], |
|
268 |
[enable the ganeti-confd daemon (default: yes)])], |
|
269 |
[[case "$enableval" in |
|
270 |
no) |
|
271 |
enable_confd=False |
|
272 |
;; |
|
273 |
yes) |
|
274 |
enable_confd=True |
|
275 |
;; |
|
276 |
*) |
|
277 |
echo "Invalid value for enable-confd '$enableval'" |
|
278 |
exit 1 |
|
279 |
;; |
|
280 |
esac |
|
281 |
]], |
|
282 |
[enable_confd=True]) |
|
283 |
AC_SUBST(ENABLE_CONFD, $enable_confd) |
|
284 |
|
|
264 | 285 |
# --with-disk-separator=... |
265 | 286 |
AC_ARG_WITH([disk-separator], |
266 | 287 |
[AS_HELP_STRING([--with-disk-separator=STRING], |
b/lib/constants.py | ||
---|---|---|
181 | 181 |
TOOLSDIR = _autoconf.TOOLSDIR |
182 | 182 |
CONF_DIR = SYSCONFDIR + "/ganeti" |
183 | 183 |
USER_SCRIPTS_DIR = CONF_DIR + "/scripts" |
184 |
ENABLE_CONFD = _autoconf.ENABLE_CONFD |
|
184 | 185 |
|
185 | 186 |
#: Lock file for watcher, locked in shared mode by watcher; lock in exclusive |
186 | 187 |
# mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call} |
Also available in: Unified diff