Revision 1211c6ed
| b/Makefile.am | ||
|---|---|---|
| 1829 | 1829 |
-DHTOOLS="True" \ |
| 1830 | 1830 |
-DENABLE_CONFD="$(ENABLE_CONFD)" \ |
| 1831 | 1831 |
-DXEN_CMD="$(XEN_CMD)" \ |
| 1832 |
-DENABLE_SPLIT_QUERY="$(ENABLE_SPLIT_QUERY)" \ |
|
| 1833 | 1832 |
-DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \ |
| 1834 | 1833 |
-DENABLE_MOND="$(ENABLE_MOND)" \ |
| 1835 | 1834 |
-DHAS_GNU_LN="$(HAS_GNU_LN)" \ |
| b/configure.ac | ||
|---|---|---|
| 623 | 623 |
HTOOLS=yes |
| 624 | 624 |
AC_SUBST(HTOOLS) |
| 625 | 625 |
|
| 626 |
# --enable-split-query |
|
| 627 |
ENABLE_SPLIT_QUERY= |
|
| 628 |
AC_ARG_ENABLE([split-query], |
|
| 629 |
[AS_HELP_STRING([--enable-split-query], |
|
| 630 |
[enable use of custom query daemon via confd])], |
|
| 631 |
[[case "$enableval" in |
|
| 632 |
no) |
|
| 633 |
enable_split_query=False |
|
| 634 |
;; |
|
| 635 |
yes) |
|
| 636 |
enable_split_query=True |
|
| 637 |
;; |
|
| 638 |
*) |
|
| 639 |
echo "Invalid value for enable-confd '$enableval'" |
|
| 640 |
exit 1 |
|
| 641 |
;; |
|
| 642 |
esac |
|
| 643 |
]], |
|
| 644 |
[[case "x${has_confd}x" in
|
|
| 645 |
xTruex) |
|
| 646 |
enable_split_query=True |
|
| 647 |
;; |
|
| 648 |
*) |
|
| 649 |
enable_split_query=False |
|
| 650 |
;; |
|
| 651 |
esac]]) |
|
| 652 |
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query) |
|
| 653 |
|
|
| 654 |
if test x$enable_split_query = xTrue -a x$has_confd != xTrue; then |
|
| 655 |
AC_MSG_ERROR([Split queries require the confd daemon]) |
|
| 656 |
fi |
|
| 657 |
|
|
| 658 |
if test x$enable_split_query = xTrue; then |
|
| 659 |
AC_MSG_NOTICE([Split query functionality enabled]) |
|
| 660 |
fi |
|
| 661 |
|
|
| 662 | 626 |
# Check for HsColour |
| 663 | 627 |
HS_APIDOC=no |
| 664 | 628 |
AC_ARG_VAR(HSCOLOUR, [HsColour path]) |
| b/lib/cli.py | ||
|---|---|---|
| 2379 | 2379 |
address = pathutils.QUERY_SOCKET |
| 2380 | 2380 |
else: |
| 2381 | 2381 |
address = override_socket |
| 2382 |
elif query and constants.ENABLE_SPLIT_QUERY:
|
|
| 2382 |
elif query: |
|
| 2383 | 2383 |
address = pathutils.QUERY_SOCKET |
| 2384 | 2384 |
else: |
| 2385 | 2385 |
address = None |
| b/lib/rapi/baserlib.py | ||
|---|---|---|
| 359 | 359 |
instead of the masterd socket |
| 360 | 360 |
|
| 361 | 361 |
""" |
| 362 |
if query and constants.ENABLE_SPLIT_QUERY:
|
|
| 362 |
if query: |
|
| 363 | 363 |
address = pathutils.QUERY_SOCKET |
| 364 | 364 |
else: |
| 365 | 365 |
address = None |
| b/src/AutoConf.hs.in | ||
|---|---|---|
| 202 | 202 |
xenCmd :: String |
| 203 | 203 |
xenCmd = "XEN_CMD" |
| 204 | 204 |
|
| 205 |
enableSplitQuery :: Bool |
|
| 206 |
enableSplitQuery = ENABLE_SPLIT_QUERY |
|
| 207 |
|
|
| 208 | 205 |
enableRestrictedCommands :: Bool |
| 209 | 206 |
enableRestrictedCommands = ENABLE_RESTRICTED_COMMANDS |
| 210 | 207 |
|
| b/src/Ganeti/Constants.hs | ||
|---|---|---|
| 313 | 313 |
enableRestrictedCommands :: Bool |
| 314 | 314 |
enableRestrictedCommands = AutoConf.enableRestrictedCommands |
| 315 | 315 |
|
| 316 |
enableSplitQuery :: Bool |
|
| 317 |
enableSplitQuery = AutoConf.enableSplitQuery |
|
| 318 |
|
|
| 319 | 316 |
-- * SSH constants |
| 320 | 317 |
|
| 321 | 318 |
ssh :: String |
Also available in: Unified diff