Add RPC call for storage operations

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bfb5862..56e70fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
+confddir = $(pkgpythondir)/confd
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -25,10 +26,12 @@ DIRS = \
        devel \
        doc \
        doc/examples \
+       doc/examples/hooks \
        lib \
        lib/http \
        lib/hypervisor \
        lib/rapi \
+       lib/confd \
        man \
        qa \
        scripts \
@@ -65,6 +68,7 @@ nodist_pkgpython_PYTHON = \
 
 pkgpython_PYTHON = \
        lib/__init__.py \
+       lib/asyncnotifier.py \
        lib/backend.py \
        lib/bdev.py \
        lib/bootstrap.py \
@@ -85,12 +89,14 @@ pkgpython_PYTHON = \
        lib/serializer.py \
        lib/ssconf.py \
        lib/ssh.py \
+       lib/storage.py \
        lib/utils.py \
        lib/workerpool.py
 
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
+       lib/hypervisor/hv_chroot.py \
        lib/hypervisor/hv_fake.py \
        lib/hypervisor/hv_kvm.py \
        lib/hypervisor/hv_xen.py
@@ -107,10 +113,15 @@ http_PYTHON = \
        lib/http/client.py \
        lib/http/server.py
 
+confd_PYTHON = \
+       lib/confd/__init__.py \
+       lib/confd/server.py \
+       lib/confd/querylib.py
 
 docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
+       doc/design-2.1.rst \
        doc/glossary.rst \
        doc/hooks.rst \
        doc/iallocator.rst \
@@ -141,6 +152,7 @@ dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
        daemons/ganeti-masterd \
+       daemons/ganeti-confd \
        daemons/ganeti-rapi \
        scripts/gnt-backup \
        scripts/gnt-cluster \
@@ -160,6 +172,7 @@ EXTRA_DIST = \
        $(MAINTAINERCLEANFILES) \
        NEWS \
        DEVNOTES \
+       pylintrc \
        autotools/docbook-wrapper \
        devel/upload.in \
        $(docdot) \
@@ -170,6 +183,7 @@ EXTRA_DIST = \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
+       doc/examples/hooks/ethers \
        doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
@@ -227,6 +241,7 @@ dist_TESTS = \
        test/ganeti.hooks_unittest.py \
        test/ganeti.http_unittest.py \
        test/ganeti.locking_unittest.py \
+       test/ganeti.objects_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.serializer_unittest.py \
        test/ganeti.ssh_unittest.py \
@@ -315,6 +330,7 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "KVM_PATH = '$(KVM_PATH)'"; \
          echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
          echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
+         echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)" ; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -327,6 +343,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          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'; \
+         echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -335,7 +352,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 srclinks: stamp-directories
        set -e; \
        for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
-                       $(rapi_PYTHON) $(http_PYTHON); do \
+                       $(rapi_PYTHON) $(http_PYTHON) $(confd_PYTHON); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
                        $(LN_S) $(abs_top_srcdir)/$$i $$i; \
                fi; \