Extract node related logical units from cmdlib

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5370f6..cc9d2d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
 clientdir = $(pkgpythondir)/client
+cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
@@ -105,6 +106,7 @@ DIRS = \
        lib \
        lib/build \
        lib/client \
+       lib/cmdlib \
        lib/confd \
        lib/http \
        lib/hypervisor \
@@ -260,12 +262,12 @@ pkgpython_PYTHON = \
        lib/bdev.py \
        lib/bootstrap.py \
        lib/cli.py \
-       lib/cmdlib.py \
        lib/compat.py \
        lib/config.py \
        lib/constants.py \
        lib/daemon.py \
        lib/errors.py \
+       lib/hooksmaster.py \
        lib/ht.py \
        lib/jqueue.py \
        lib/jstore.py \
@@ -305,6 +307,17 @@ client_PYTHON = \
        lib/client/gnt_os.py \
        lib/client/gnt_storage.py
 
+cmdlib_PYTHON = \
+       lib/cmdlib/__init__.py \
+       lib/cmdlib/common.py \
+       lib/cmdlib/base.py \
+       lib/cmdlib/cluster.py \
+       lib/cmdlib/group.py \
+       lib/cmdlib/node.py \
+       lib/cmdlib/tags.py \
+       lib/cmdlib/network.py \
+       lib/cmdlib/test.py
+
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
@@ -417,7 +430,7 @@ docinput = \
        doc/design-virtual-clusters.rst \
        doc/design-x509-ca.rst \
        doc/design-hroller.rst \
-       doc/design-storagespace.rst \
+       doc/design-storagetypes.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -443,7 +456,11 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst)))
 HS_BIN_PROGS=src/htools
 
 # Haskell programs to be installed in the MYEXECLIB dir
+if ENABLE_MOND
 HS_MYEXECLIB_PROGS=src/mon-collector
+else
+HS_MYEXECLIB_PROGS=
+endif
 
 # Haskell programs to be compiled by "make really-all"
 HS_COMPILE_PROGS= \
@@ -1002,18 +1019,23 @@ TEST_FILES = \
        test/data/htools/hail-reloc-drbd.json \
        test/data/htools/hbal-excl-tags.data \
        test/data/htools/hbal-split-insts.data \
+       test/data/htools/hspace-tiered-dualspec.data \
+       test/data/htools/hspace-tiered.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \
+       test/data/htools/multiple-master.data \
        test/data/htools/n1-failure.data \
        test/data/htools/rapi/groups.json \
        test/data/htools/rapi/info.json \
        test/data/htools/rapi/instances.json \
        test/data/htools/rapi/nodes.json \
+       test/data/htools/unique-reboot-order.data \
        test/hs/shelltests/htools-balancing.test \
        test/hs/shelltests/htools-basic.test \
        test/hs/shelltests/htools-dynutil.test \
        test/hs/shelltests/htools-excl.test \
        test/hs/shelltests/htools-hail.test \
+       test/hs/shelltests/htools-hroller.test \
        test/hs/shelltests/htools-hspace.test \
        test/hs/shelltests/htools-invalid.test \
        test/hs/shelltests/htools-multi-group.test \
@@ -1041,6 +1063,8 @@ TEST_FILES = \
        test/data/bdev-rbd/output_invalid.txt \
        test/data/cert1.pem \
        test/data/cert2.pem \
+       test/data/cluster_config_2.7.json \
+       test/data/cluster_config_downgraded_2.7.json \
        test/data/instance-minor-pairing.txt \
        test/data/ip-addr-show-dummy0.txt \
        test/data/ip-addr-show-lo-ipv4.txt \
@@ -1228,6 +1252,7 @@ all_python_code = \
        $(python_tests) \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
+       $(cmdlib_PYTHON) \
        $(hypervisor_PYTHON) \
        $(rapi_PYTHON) \
        $(server_PYTHON) \
@@ -1672,7 +1697,7 @@ check-local: check-dirs $(GENERATED_FILES)
        $(CHECK_PYTHON_CODE) $(check_python_code)
        PYTHONPATH=. $(CHECK_HEADER) $(check_python_code)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
-       $(CHECK_NEWS) < $(top_srcdir)/NEWS
+       RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
        @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        error= ; \
@@ -1813,18 +1838,12 @@ distcheck-hook:
          echo "Found empty files or directories in final archive." 1>&2; \
          exit 1; \
        fi
-       if test -n "$(BUILD_RELEASE)" && \
-          grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
-          echo "Found unreleased version in NEWS." >&2; \
-          exit 1; \
-       fi
        if test -e $(top_distdir)/doc/man-html; then \
          echo "Found documentation including man pages in final archive" >&2; \
          exit 1; \
        fi
 
-# When building a release, stricter checks should be used
-distcheck-release dist-release: export BUILD_RELEASE = 1
+# Backwards compatible distcheck-release target
 distcheck-release: distcheck
 
 distrebuildcheck: dist