Rename Ganeti/HTools/Utils.hs to Ganeti/Utils.hs

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1b90974..c199d6b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,6 +169,7 @@ CLEANFILES = \
        $(nodist_pkgpython_PYTHON) \
        $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
        $(HS_BUILT_TEST_HELPERS) \
+       htools/ganeti-confd \
        .hpc/*.mix htools/*.tix htest/*.tix \
        doc/hs-lint.html
 
@@ -180,7 +181,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
@@ -292,9 +293,7 @@ http_PYTHON = \
 
 confd_PYTHON = \
        lib/confd/__init__.py \
-       lib/confd/client.py \
-       lib/confd/querylib.py \
-       lib/confd/server.py
+       lib/confd/client.py
 
 masterd_PYTHON = \
        lib/masterd/__init__.py \
@@ -311,7 +310,6 @@ watcher_PYTHON = \
 
 server_PYTHON = \
        lib/server/__init__.py \
-       lib/server/confd.py \
        lib/server/masterd.py \
        lib/server/noded.py \
        lib/server/rapi.py
@@ -364,6 +362,7 @@ docrst = \
        doc/design-virtual-clusters.rst \
        doc/design-bulk-create.rst \
        doc/design-query-splitting.rst \
+       doc/design-partitioned.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -422,7 +421,6 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Simu.hs \
        htools/Ganeti/HTools/Text.hs \
        htools/Ganeti/HTools/Types.hs \
-       htools/Ganeti/HTools/Utils.hs \
        htools/Ganeti/HTools/Program.hs \
        htools/Ganeti/HTools/Program/Hail.hs \
        htools/Ganeti/HTools/Program/Hbal.hs \
@@ -457,7 +455,8 @@ HS_LIB_SRCS = \
        htools/Ganeti/Rpc.hs \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \
-       htools/Ganeti/THH.hs
+       htools/Ganeti/THH.hs \
+       htools/Ganeti/Utils.hs
 
 HS_TEST_SRCS = \
        htest/Test/Ganeti/BasicTypes.hs \
@@ -474,7 +473,6 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/HTools/Simu.hs \
        htest/Test/Ganeti/HTools/Text.hs \
        htest/Test/Ganeti/HTools/Types.hs \
-       htest/Test/Ganeti/HTools/Utils.hs \
        htest/Test/Ganeti/JSON.hs \
        htest/Test/Ganeti/Jobs.hs \
        htest/Test/Ganeti/Luxi.hs \
@@ -487,7 +485,8 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/Ssconf.hs \
        htest/Test/Ganeti/TestCommon.hs \
        htest/Test/Ganeti/TestHTools.hs \
-       htest/Test/Ganeti/TestHelper.hs
+       htest/Test/Ganeti/TestHelper.hs \
+       htest/Test/Ganeti/Utils.hs
 
 HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
 
@@ -567,10 +566,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,9 +599,6 @@ install-exec-hook:
                $(LN_S) -f htools \
                           $(DESTDIR)$(bindir)/$$role ; \
        done
-if HS_CONFD
-       mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
-endif
 endif
 
 $(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
@@ -657,8 +649,11 @@ nodist_sbin_SCRIPTS = \
        daemons/ganeti-cleaner \
        daemons/ganeti-master-cleaner
 
-if HS_CONFD
-nodist_sbin_SCRIPTS += htools/hconfd
+if ENABLE_CONFD
+htools/ganeti-confd: htools/hconfd
+       cp -f $< $@
+
+nodist_sbin_SCRIPTS += htools/ganeti-confd
 endif
 
 python_scripts = \
@@ -1249,8 +1244,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)"; \
        } > $@