Commit 04520998 authored by Iustin Pop's avatar Iustin Pop

Remove option to select the Python version of confd

This will need some more configure.ac checks for required libraries,
which will come later with the Haskell dependencies reorganisation.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent ab171697
......@@ -180,7 +180,7 @@ GENERATED_FILES = \
HTOOLS_GENERATED_FILES =
if WANT_HTOOLS
HTOOLS_GENERATED_FILES += $(HS_PROGS)
if HS_CONFD
if ENABLE_CONFD
HTOOLS_GENERATED_FILES += htools/hconfd
endif
endif
......@@ -567,10 +567,6 @@ PYTHON_BOOTSTRAP_SBIN = \
daemons/ganeti-rapi \
$(gnt_scripts)
if PY_CONFD
PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
endif
PYTHON_BOOTSTRAP = \
$(PYTHON_BOOTSTRAP_SBIN) \
tools/ensure-dirs
......@@ -604,7 +600,7 @@ install-exec-hook:
$(LN_S) -f htools \
$(DESTDIR)$(bindir)/$$role ; \
done
if HS_CONFD
if ENABLE_CONFD
mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
endif
endif
......@@ -657,7 +653,7 @@ nodist_sbin_SCRIPTS = \
daemons/ganeti-cleaner \
daemons/ganeti-master-cleaner
if HS_CONFD
if ENABLE_CONFD
nodist_sbin_SCRIPTS += htools/hconfd
endif
......@@ -1249,8 +1245,6 @@ lib/_autoconf.py: Makefile | stamp-directories
echo "HTOOLS = False"; \
fi; \
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
echo "PY_CONFD = $(PY_CONFD)"; \
echo "HS_CONFD = $(HS_CONFD)"; \
echo "XEN_CMD = '$(XEN_CMD)'"; \
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
} > $@
......
......@@ -330,22 +330,13 @@ AC_ARG_ENABLE([htools-rapi],
ENABLE_CONFD=
AC_ARG_ENABLE([confd],
[AS_HELP_STRING([--enable-confd],
[enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
[enable the ganeti-confd daemon (default: yes)])],
[[case "$enableval" in
no)
enable_confd=False
py_confd=False
hs_confd=False
;;
yes|python)
yes|haskell)
enable_confd=True
py_confd=True
hs_confd=False
;;
haskell)
enable_confd=True
py_confd=False
hs_confd=True
;;
*)
echo "Invalid value for enable-confd '$enableval'"
......@@ -353,20 +344,16 @@ AC_ARG_ENABLE([confd],
;;
esac
]],
[enable_confd=True;py_confd=True;hs_confd=False])
[enable_confd=True])
AC_SUBST(ENABLE_CONFD, $enable_confd)
AC_SUBST(PY_CONFD, $py_confd)
AC_SUBST(HS_CONFD, $hs_confd)
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])
AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue])
AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue])
AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue])
# --enable-split-query
ENABLE_SPLIT_QUERY=
AC_ARG_ENABLE([split-query],
[AS_HELP_STRING([--enable-split-query],
[enable use of custom query daemon via Haskell confd])],
[enable use of custom query daemon via confd])],
[[case "$enableval" in
no)
enable_split_query=False
......@@ -383,8 +370,8 @@ AC_ARG_ENABLE([split-query],
[enable_split_query=False])
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
if test x$enable_split_query = xTrue -a x$hs_confd != xTrue; then
AC_MSG_ERROR([Split queries require the Haskell confd])
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
AC_MSG_ERROR([Split queries require the confd daemon])
fi
# --with-disk-separator=...
......@@ -592,8 +579,8 @@ fi
fi # end if enable_htools, define automake conditions
if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if
if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if
htools support is not enabled]))
fi
......
......@@ -908,11 +908,6 @@ def ListDrbd(opts, args):
" been enabled at build time.")
return constants.EXIT_FAILURE
if not constants.HS_CONFD:
ToStderr("Error: this command requires the Haskell version of confd,"
" but it has not been enabled at build time.")
return constants.EXIT_FAILURE
status = ReplyStatus()
def ListDrbdConfdCallback(reply):
......
......@@ -141,7 +141,6 @@ ETC_HOSTS = "/etc/hosts"
ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE
ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE
ENABLE_CONFD = _autoconf.ENABLE_CONFD
HS_CONFD = _autoconf.HS_CONFD
ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
NODED = "ganeti-noded"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment