Revision 04520998
| b/Makefile.am | ||
|---|---|---|
| 180 | 180 |
HTOOLS_GENERATED_FILES = |
| 181 | 181 |
if WANT_HTOOLS |
| 182 | 182 |
HTOOLS_GENERATED_FILES += $(HS_PROGS) |
| 183 |
if HS_CONFD
|
|
| 183 |
if ENABLE_CONFD
|
|
| 184 | 184 |
HTOOLS_GENERATED_FILES += htools/hconfd |
| 185 | 185 |
endif |
| 186 | 186 |
endif |
| ... | ... | |
| 567 | 567 |
daemons/ganeti-rapi \ |
| 568 | 568 |
$(gnt_scripts) |
| 569 | 569 |
|
| 570 |
if PY_CONFD |
|
| 571 |
PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd |
|
| 572 |
endif |
|
| 573 |
|
|
| 574 | 570 |
PYTHON_BOOTSTRAP = \ |
| 575 | 571 |
$(PYTHON_BOOTSTRAP_SBIN) \ |
| 576 | 572 |
tools/ensure-dirs |
| ... | ... | |
| 604 | 600 |
$(LN_S) -f htools \ |
| 605 | 601 |
$(DESTDIR)$(bindir)/$$role ; \ |
| 606 | 602 |
done |
| 607 |
if HS_CONFD
|
|
| 603 |
if ENABLE_CONFD
|
|
| 608 | 604 |
mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd |
| 609 | 605 |
endif |
| 610 | 606 |
endif |
| ... | ... | |
| 657 | 653 |
daemons/ganeti-cleaner \ |
| 658 | 654 |
daemons/ganeti-master-cleaner |
| 659 | 655 |
|
| 660 |
if HS_CONFD
|
|
| 656 |
if ENABLE_CONFD
|
|
| 661 | 657 |
nodist_sbin_SCRIPTS += htools/hconfd |
| 662 | 658 |
endif |
| 663 | 659 |
|
| ... | ... | |
| 1249 | 1245 |
echo "HTOOLS = False"; \ |
| 1250 | 1246 |
fi; \ |
| 1251 | 1247 |
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ |
| 1252 |
echo "PY_CONFD = $(PY_CONFD)"; \ |
|
| 1253 |
echo "HS_CONFD = $(HS_CONFD)"; \ |
|
| 1254 | 1248 |
echo "XEN_CMD = '$(XEN_CMD)'"; \ |
| 1255 | 1249 |
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ |
| 1256 | 1250 |
} > $@ |
| b/configure.ac | ||
|---|---|---|
| 330 | 330 |
ENABLE_CONFD= |
| 331 | 331 |
AC_ARG_ENABLE([confd], |
| 332 | 332 |
[AS_HELP_STRING([--enable-confd], |
| 333 |
[enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
|
|
| 333 |
[enable the ganeti-confd daemon (default: yes)])],
|
|
| 334 | 334 |
[[case "$enableval" in |
| 335 | 335 |
no) |
| 336 | 336 |
enable_confd=False |
| 337 |
py_confd=False |
|
| 338 |
hs_confd=False |
|
| 339 | 337 |
;; |
| 340 |
yes|python)
|
|
| 338 |
yes|haskell)
|
|
| 341 | 339 |
enable_confd=True |
| 342 |
py_confd=True |
|
| 343 |
hs_confd=False |
|
| 344 |
;; |
|
| 345 |
haskell) |
|
| 346 |
enable_confd=True |
|
| 347 |
py_confd=False |
|
| 348 |
hs_confd=True |
|
| 349 | 340 |
;; |
| 350 | 341 |
*) |
| 351 | 342 |
echo "Invalid value for enable-confd '$enableval'" |
| ... | ... | |
| 353 | 344 |
;; |
| 354 | 345 |
esac |
| 355 | 346 |
]], |
| 356 |
[enable_confd=True;py_confd=True;hs_confd=False])
|
|
| 347 |
[enable_confd=True]) |
|
| 357 | 348 |
AC_SUBST(ENABLE_CONFD, $enable_confd) |
| 358 |
AC_SUBST(PY_CONFD, $py_confd) |
|
| 359 |
AC_SUBST(HS_CONFD, $hs_confd) |
|
| 360 | 349 |
|
| 361 |
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue]) |
|
| 362 |
AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue]) |
|
| 363 |
AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue]) |
|
| 350 |
AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue]) |
|
| 364 | 351 |
|
| 365 | 352 |
# --enable-split-query |
| 366 | 353 |
ENABLE_SPLIT_QUERY= |
| 367 | 354 |
AC_ARG_ENABLE([split-query], |
| 368 | 355 |
[AS_HELP_STRING([--enable-split-query], |
| 369 |
[enable use of custom query daemon via Haskell confd])],
|
|
| 356 |
[enable use of custom query daemon via confd])], |
|
| 370 | 357 |
[[case "$enableval" in |
| 371 | 358 |
no) |
| 372 | 359 |
enable_split_query=False |
| ... | ... | |
| 383 | 370 |
[enable_split_query=False]) |
| 384 | 371 |
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query) |
| 385 | 372 |
|
| 386 |
if test x$enable_split_query = xTrue -a x$hs_confd != xTrue; then
|
|
| 387 |
AC_MSG_ERROR([Split queries require the Haskell confd])
|
|
| 373 |
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
|
|
| 374 |
AC_MSG_ERROR([Split queries require the confd daemon])
|
|
| 388 | 375 |
fi |
| 389 | 376 |
|
| 390 | 377 |
# --with-disk-separator=... |
| ... | ... | |
| 592 | 579 |
|
| 593 | 580 |
fi # end if enable_htools, define automake conditions |
| 594 | 581 |
|
| 595 |
if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
|
|
| 596 |
AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if
|
|
| 582 |
if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then
|
|
| 583 |
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if |
|
| 597 | 584 |
htools support is not enabled])) |
| 598 | 585 |
fi |
| 599 | 586 |
|
| b/lib/client/gnt_node.py | ||
|---|---|---|
| 908 | 908 |
" been enabled at build time.") |
| 909 | 909 |
return constants.EXIT_FAILURE |
| 910 | 910 |
|
| 911 |
if not constants.HS_CONFD: |
|
| 912 |
ToStderr("Error: this command requires the Haskell version of confd,"
|
|
| 913 |
" but it has not been enabled at build time.") |
|
| 914 |
return constants.EXIT_FAILURE |
|
| 915 |
|
|
| 916 | 911 |
status = ReplyStatus() |
| 917 | 912 |
|
| 918 | 913 |
def ListDrbdConfdCallback(reply): |
| b/lib/constants.py | ||
|---|---|---|
| 141 | 141 |
ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE |
| 142 | 142 |
ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE |
| 143 | 143 |
ENABLE_CONFD = _autoconf.ENABLE_CONFD |
| 144 |
HS_CONFD = _autoconf.HS_CONFD |
|
| 145 | 144 |
ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY |
| 146 | 145 |
|
| 147 | 146 |
NODED = "ganeti-noded" |
Also available in: Unified diff