Commit cd8b0072 authored by Iustin Pop's avatar Iustin Pop
Browse files

Add toggle for enabling/disabling confd



Doesn't do anything yet.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent b99d1638
......@@ -1003,6 +1003,7 @@ lib/_autoconf.py: Makefile | lib/.dir
else \
echo "HTOOLS = False"; \
fi; \
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
} > $@
lib/_vcsversion.py: Makefile vcs-version | lib/.dir
......@@ -1054,6 +1055,7 @@ $(REPLACE_VARS_SED): Makefile
echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
} > $@
# Using deferred evaluation
......
......@@ -261,6 +261,27 @@ AC_ARG_ENABLE([htools-rapi],
[],
[enable_htools_rapi=no])
# --enable-htools
ENABLE_CONFD=
AC_ARG_ENABLE([confd],
[AS_HELP_STRING([--enable-confd],
[enable the ganeti-confd daemon (default: yes)])],
[[case "$enableval" in
no)
enable_confd=False
;;
yes)
enable_confd=True
;;
*)
echo "Invalid value for enable-confd '$enableval'"
exit 1
;;
esac
]],
[enable_confd=True])
AC_SUBST(ENABLE_CONFD, $enable_confd)
# --with-disk-separator=...
AC_ARG_WITH([disk-separator],
[AS_HELP_STRING([--with-disk-separator=STRING],
......
......@@ -181,6 +181,7 @@ SYSCONFDIR = _autoconf.SYSCONFDIR
TOOLSDIR = _autoconf.TOOLSDIR
CONF_DIR = SYSCONFDIR + "/ganeti"
USER_SCRIPTS_DIR = CONF_DIR + "/scripts"
ENABLE_CONFD = _autoconf.ENABLE_CONFD
#: Lock file for watcher, locked in shared mode by watcher; lock in exclusive
# mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call}
......
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