mcpu: Implement lock timeouts

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 27445a3..51270a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ ACLOCAL_AMFLAGS = -I autotools
 DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
+CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
@@ -129,6 +130,7 @@ http_PYTHON = \
 
 confd_PYTHON = \
        lib/confd/__init__.py \
+       lib/confd/client.py \
        lib/confd/server.py \
        lib/confd/querylib.py
 
@@ -136,6 +138,7 @@ docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
+       doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
        doc/iallocator.rst \
@@ -157,7 +160,9 @@ doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
        touch "$@"
 
 docdot = \
-       doc/arch-2.0.dot
+       doc/arch-2.0.dot \
+       doc/design-2.1-lock-acquire.dot \
+       doc/design-2.1-lock-release.dot
 
 docpng = $(patsubst %.dot,%.png,$(docdot))
 
@@ -192,9 +197,9 @@ dist_tools_SCRIPTS = \
 EXTRA_DIST = \
        $(MAINTAINERCLEANFILES) \
        NEWS \
-       DEVNOTES \
        pylintrc \
        autotools/build-bash-completion \
+       autotools/check-python-code \
        autotools/docbook-wrapper \
        autotools/run-in-tempdir \
        daemons/ganeti-cleaner.in \
@@ -230,6 +235,7 @@ EXTRA_DIST = \
 
 man_MANS = \
        man/ganeti.7 \
+       man/ganeti-cleaner.8 \
        man/ganeti-masterd.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
@@ -253,17 +259,20 @@ TEST_FILES = \
        test/data/bdev-disk.txt \
        test/data/bdev-net.txt \
        test/data/proc_drbd8.txt \
+       test/data/proc_drbd80-emptyline.txt \
        test/data/proc_drbd83.txt
 
 dist_TESTS = \
        test/ganeti.bdev_unittest.py \
        test/ganeti.cli_unittest.py \
        test/ganeti.cmdlib_unittest.py \
+       test/ganeti.confd_client_unittest.py \
        test/ganeti.config_unittest.py \
        test/ganeti.constants_unittest.py \
        test/ganeti.hooks_unittest.py \
        test/ganeti.http_unittest.py \
        test/ganeti.locking_unittest.py \
+       test/ganeti.mcpu_unittest.py \
        test/ganeti.objects_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.serializer_unittest.py \
@@ -280,8 +289,7 @@ TESTS_ENVIRONMENT = \
        PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
        $(RUN_IN_TEMPDIR) $(PYTHON)
 
-srclink_files = \
-       man/footer.sgml \
+all_python_code = \
        $(dist_sbin_SCRIPTS) \
        $(dist_tools_SCRIPTS) \
        $(dist_TESTS) \
@@ -292,6 +300,13 @@ srclink_files = \
        $(confd_PYTHON) \
        $(noinst_PYTHON)
 
+srclink_files = \
+       man/footer.sgml \
+       $(all_python_code)
+
+check_python_code = \
+       $(all_python_code)
+
 all-local: stamp-directories devel/upload \
        doc/examples/bash_completion \
        doc/examples/ganeti.initd doc/examples/ganeti.cron \
@@ -363,6 +378,7 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
          echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
          echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
+         echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
          echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
@@ -383,6 +399,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          echo 's#@BINDIR@#$(bindir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+         echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
          echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
          echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
@@ -403,6 +420,9 @@ srclinks: stamp-directories
 ganeti:
        cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
 
+check-local:
+       $(CHECK_PYTHON_CODE) $(check_python_code)
+
 # a dist hook rule for catching revision control directories
 distcheck-hook:
        if find $(top_distdir) | grep -F -e '.svn' -e '.git'; then \