mcpu: Implement lock timeouts

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 84229b5..51270a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,6 +130,7 @@ http_PYTHON = \
 
 confd_PYTHON = \
        lib/confd/__init__.py \
+       lib/confd/client.py \
        lib/confd/server.py \
        lib/confd/querylib.py
 
@@ -159,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))
 
@@ -232,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 \
@@ -255,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 \
@@ -371,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)'"; \
@@ -391,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'; \