configure: Add option to enable remote commands

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd41776..88f1369 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ HTOOLS_DIRS = \
        htools/Ganeti \
        htools/Ganeti/Confd \
        htools/Ganeti/HTools \
+       htools/Ganeti/HTools/Backend \
        htools/Ganeti/HTools/Program \
        htools/Ganeti/Query \
        htest \
@@ -66,6 +67,7 @@ HTOOLS_DIRS = \
        htest/Test/Ganeti \
        htest/Test/Ganeti/Confd \
        htest/Test/Ganeti/HTools \
+       htest/Test/Ganeti/HTools/Backend \
        htest/Test/Ganeti/Query
 
 DIRS = \
@@ -108,6 +110,7 @@ BUILDTIME_DIR_AUTOCREATE = \
        $(APIDOC_HS_DIR)/Ganeti \
        $(APIDOC_HS_DIR)/Ganeti/Confd \
        $(APIDOC_HS_DIR)/Ganeti/HTools \
+       $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
        $(APIDOC_HS_DIR)/Ganeti/HTools/Program \
        $(APIDOC_HS_DIR)/Ganeti/Query \
        $(APIDOC_PY_DIR) \
@@ -154,7 +157,6 @@ CLEANFILES = \
        $(SHELL_ENV_INIT) \
        daemons/daemon-util \
        daemons/ganeti-cleaner \
-       devel/upload \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
        doc/examples/bash_completion-debug \
@@ -206,6 +208,8 @@ BUILT_EXAMPLES = \
        doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti-master-role.ocf \
+       doc/examples/ganeti-node-role.ocf \
        doc/examples/gnt-config-backup \
        doc/examples/hooks/ipsec
 
@@ -399,7 +403,12 @@ HS_ALL_PROGS = \
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
 
-HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+HFLAGS = \
+       -O -Wall -Werror -ihtools \
+       -fwarn-monomorphism-restriction \
+       -fwarn-tabs \
+       $(GHC_BYVERSION_FLAGS)
+
 # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
 # internal extra flags (used for htest/test mainly)
@@ -420,21 +429,24 @@ HS_LIB_SRCS = \
        htools/Ganeti/BasicTypes.hs \
        htools/Ganeti/Common.hs \
        htools/Ganeti/Compat.hs \
-       htools/Ganeti/Confd.hs \
        htools/Ganeti/Confd/Server.hs \
+       htools/Ganeti/Confd/Types.hs \
        htools/Ganeti/Confd/Utils.hs \
        htools/Ganeti/Config.hs \
        htools/Ganeti/Daemon.hs \
        htools/Ganeti/Errors.hs \
+       htools/Ganeti/HTools/Backend/IAlloc.hs \
+       htools/Ganeti/HTools/Backend/Luxi.hs \
+       htools/Ganeti/HTools/Backend/Rapi.hs \
+       htools/Ganeti/HTools/Backend/Simu.hs \
+       htools/Ganeti/HTools/Backend/Text.hs \
        htools/Ganeti/HTools/CLI.hs \
        htools/Ganeti/HTools/Cluster.hs \
        htools/Ganeti/HTools/Container.hs \
        htools/Ganeti/HTools/ExtLoader.hs \
        htools/Ganeti/HTools/Group.hs \
-       htools/Ganeti/HTools/IAlloc.hs \
        htools/Ganeti/HTools/Instance.hs \
        htools/Ganeti/HTools/Loader.hs \
-       htools/Ganeti/HTools/Luxi.hs \
        htools/Ganeti/HTools/Node.hs \
        htools/Ganeti/HTools/PeerMap.hs \
        htools/Ganeti/HTools/Program.hs \
@@ -444,9 +456,6 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Program/Hinfo.hs \
        htools/Ganeti/HTools/Program/Hscan.hs \
        htools/Ganeti/HTools/Program/Hspace.hs \
-       htools/Ganeti/HTools/Rapi.hs \
-       htools/Ganeti/HTools/Simu.hs \
-       htools/Ganeti/HTools/Text.hs \
        htools/Ganeti/HTools/Types.hs \
        htools/Ganeti/Hash.hs \
        htools/Ganeti/JSON.hs \
@@ -471,11 +480,14 @@ HS_LIB_SRCS = \
        htools/Ganeti/Utils.hs
 
 HS_TEST_SRCS = \
+       htest/Test/Ganeti/Attoparsec.hs \
        htest/Test/Ganeti/BasicTypes.hs \
        htest/Test/Ganeti/Common.hs \
        htest/Test/Ganeti/Confd/Utils.hs \
        htest/Test/Ganeti/Daemon.hs \
        htest/Test/Ganeti/Errors.hs \
+       htest/Test/Ganeti/HTools/Backend/Simu.hs \
+       htest/Test/Ganeti/HTools/Backend/Text.hs \
        htest/Test/Ganeti/HTools/CLI.hs \
        htest/Test/Ganeti/HTools/Cluster.hs \
        htest/Test/Ganeti/HTools/Container.hs \
@@ -483,8 +495,6 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/HTools/Loader.hs \
        htest/Test/Ganeti/HTools/Node.hs \
        htest/Test/Ganeti/HTools/PeerMap.hs \
-       htest/Test/Ganeti/HTools/Simu.hs \
-       htest/Test/Ganeti/HTools/Text.hs \
        htest/Test/Ganeti/HTools/Types.hs \
        htest/Test/Ganeti/JSON.hs \
        htest/Test/Ganeti/Jobs.hs \
@@ -496,6 +506,7 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/Query/Query.hs \
        htest/Test/Ganeti/Rpc.hs \
        htest/Test/Ganeti/Ssconf.hs \
+       htest/Test/Ganeti/THH.hs \
        htest/Test/Ganeti/TestCommon.hs \
        htest/Test/Ganeti/TestHTools.hs \
        htest/Test/Ganeti/TestHelper.hs \
@@ -555,7 +566,6 @@ docpng = $(patsubst %.dot,%.png,$(docdot))
 # Things to build but not to install (add it to EXTRA_DIST if it should be
 # distributed)
 noinst_DATA = \
-       devel/upload \
        doc/html \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
@@ -677,14 +687,13 @@ python_scripts = \
        tools/lvmstrap \
        tools/move-instance \
        tools/ovfconverter \
-       tools/sanitize-config \
-       tools/setup-ssh
+       tools/sanitize-config
 
 dist_tools_SCRIPTS = \
        $(python_scripts) \
        tools/kvm-console-wrapper \
        tools/master-ip-setup \
-       tools/xm-console-wrapper
+       tools/xen-console-wrapper
 
 nodist_tools_SCRIPTS = \
        tools/vcluster-setup
@@ -729,7 +738,7 @@ EXTRA_DIST = \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
        $(pkglib_python_scripts) \
-       devel/upload.in \
+       devel/upload \
        tools/kvm-ifup.in \
        tools/vcluster-setup.in \
        $(docdot) \
@@ -930,6 +939,7 @@ python_tests = \
        test/ganeti.rpc_unittest.py \
        test/ganeti.runtime_unittest.py \
        test/ganeti.serializer_unittest.py \
+       test/ganeti.server.rapi_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.storage_unittest.py \
        test/ganeti.tools.ensure_dirs_unittest.py \
@@ -1067,10 +1077,6 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
-devel/upload: devel/upload.in $(REPLACE_VARS_SED)
-       sed -f $(REPLACE_VARS_SED) < $< > $@
-       chmod u+x $@
-
 tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
@@ -1158,11 +1164,14 @@ clean-vcs-version:
 
 .PHONY: regen-vcs-version
 regen-vcs-version:
-       set -e; \
+       @set -e; \
        cd $(srcdir); \
        if test -d .git; then \
-         $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \
-         $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
+         T=`mktemp` ; trap 'rm -f $$T' EXIT; \
+         git describe > $$T; \
+         if ! cmp --quiet $$T vcs-version; then \
+           mv $$T vcs-version; \
+         fi; \
        fi
 
 htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
@@ -1256,6 +1265,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
          echo "XEN_CMD = '$(XEN_CMD)'"; \
          echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
+         echo "ENABLE_REMOTE_COMMANDS = $(ENABLE_REMOTE_COMMANDS)"; \
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1599,6 +1609,7 @@ hs-apidoc: $(HS_BUILT_SRCS)
        @test -n "$(HADDOCK)" || \
            { echo 'haddock' not found during configure; exit 1; }
        rm -rf $(APIDOC_HS_DIR)/*
+       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Backend
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query