Revision 73b0fa69
| b/Makefile.am | ||
|---|---|---|
| 355 | 355 |
doc/walkthrough.rst |
| 356 | 356 |
|
| 357 | 357 |
HS_PROGS = htools/htools |
| 358 |
if WANT_CONFD |
|
| 359 |
HS_PROGS += htools/hconfd |
|
| 360 |
endif |
|
| 361 | 358 |
HS_BIN_ROLES = hbal hscan hspace hinfo |
| 362 | 359 |
|
| 363 |
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools |
|
| 360 |
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd
|
|
| 364 | 361 |
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) |
| 365 | 362 |
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail |
| 366 | 363 |
|
| ... | ... | |
| 485 | 482 |
scripts/gnt-os |
| 486 | 483 |
|
| 487 | 484 |
PYTHON_BOOTSTRAP_SBIN = \ |
| 488 |
daemons/ganeti-confd \ |
|
| 489 | 485 |
daemons/ganeti-masterd \ |
| 490 | 486 |
daemons/ganeti-noded \ |
| 491 | 487 |
daemons/ganeti-watcher \ |
| 492 | 488 |
daemons/ganeti-rapi \ |
| 493 | 489 |
$(gnt_scripts) |
| 494 | 490 |
|
| 491 |
if PY_CONFD |
|
| 492 |
PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd |
|
| 493 |
endif |
|
| 494 |
|
|
| 495 | 495 |
PYTHON_BOOTSTRAP = \ |
| 496 | 496 |
$(PYTHON_BOOTSTRAP_SBIN) \ |
| 497 | 497 |
tools/ensure-dirs |
| ... | ... | |
| 523 | 523 |
$(LN_S) -f htools \ |
| 524 | 524 |
$(DESTDIR)$(bindir)/$$role ; \ |
| 525 | 525 |
done |
| 526 |
if HS_CONFD |
|
| 527 |
mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd |
|
| 528 |
endif |
|
| 526 | 529 |
endif |
| 527 | 530 |
|
| 528 | 531 |
$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile |
| ... | ... | |
| 573 | 576 |
$(PYTHON_BOOTSTRAP_SBIN) \ |
| 574 | 577 |
daemons/ganeti-cleaner |
| 575 | 578 |
|
| 579 |
if HS_CONFD |
|
| 580 |
nodist_sbin_SCRIPTS += htools/hconfd |
|
| 581 |
endif |
|
| 582 |
|
|
| 576 | 583 |
python_scripts = \ |
| 577 | 584 |
tools/burnin \ |
| 578 | 585 |
tools/cfgshell \ |
| ... | ... | |
| 1109 | 1116 |
echo "HTOOLS = False"; \ |
| 1110 | 1117 |
fi; \ |
| 1111 | 1118 |
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ |
| 1119 |
echo "PY_CONFD = $(PY_CONFD)"; \ |
|
| 1120 |
echo "HS_CONFD = $(HS_CONFD)"; \ |
|
| 1112 | 1121 |
} > $@ |
| 1113 | 1122 |
|
| 1114 | 1123 |
lib/_vcsversion.py: Makefile vcs-version | lib/.dir |
| b/configure.ac | ||
|---|---|---|
| 270 | 270 |
ENABLE_CONFD= |
| 271 | 271 |
AC_ARG_ENABLE([confd], |
| 272 | 272 |
[AS_HELP_STRING([--enable-confd], |
| 273 |
[enable the ganeti-confd daemon (default: yes)])],
|
|
| 273 |
[enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
|
|
| 274 | 274 |
[[case "$enableval" in |
| 275 | 275 |
no) |
| 276 | 276 |
enable_confd=False |
| 277 |
py_confd=False |
|
| 278 |
hs_confd=False |
|
| 277 | 279 |
;; |
| 278 |
yes) |
|
| 280 |
yes|python) |
|
| 281 |
enable_confd=True |
|
| 282 |
py_confd=True |
|
| 283 |
hs_confd=False |
|
| 284 |
;; |
|
| 285 |
haskell) |
|
| 279 | 286 |
enable_confd=True |
| 287 |
py_confd=False |
|
| 288 |
hs_confd=True |
|
| 280 | 289 |
;; |
| 281 | 290 |
*) |
| 282 | 291 |
echo "Invalid value for enable-confd '$enableval'" |
| ... | ... | |
| 284 | 293 |
;; |
| 285 | 294 |
esac |
| 286 | 295 |
]], |
| 287 |
[enable_confd=True]) |
|
| 296 |
[enable_confd=True;py_confd=True;hs_confd=False])
|
|
| 288 | 297 |
AC_SUBST(ENABLE_CONFD, $enable_confd) |
| 298 |
AC_SUBST(PY_CONFD, $py_confd) |
|
| 299 |
AC_SUBST(HS_CONFD, $hs_confd) |
|
| 289 | 300 |
|
| 290 | 301 |
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue]) |
| 302 |
AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue]) |
|
| 303 |
AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue]) |
|
| 291 | 304 |
|
| 292 | 305 |
# --with-disk-separator=... |
| 293 | 306 |
AC_ARG_WITH([disk-separator], |
| ... | ... | |
| 485 | 498 |
|
| 486 | 499 |
fi # end if enable_htools, define automake conditions |
| 487 | 500 |
|
| 501 |
if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then |
|
| 502 |
AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if |
|
| 503 |
htools support is not enabled])) |
|
| 504 |
fi |
|
| 505 |
|
|
| 488 | 506 |
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes]) |
| 489 | 507 |
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x]) |
| 490 | 508 |
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes]) |
Also available in: Unified diff