Add RPC call for storage operations
[ganeti-local] / Makefile.am
index eefa1da..56e70fb 100644 (file)
@@ -11,11 +11,11 @@ abs_top_srcdir = @abs_top_srcdir@
 
 ACLOCAL_AMFLAGS = -I autotools
 DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
-BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
 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)
@@ -26,10 +26,12 @@ DIRS = \
        devel \
        doc \
        doc/examples \
+       doc/examples/hooks \
        lib \
        lib/http \
        lib/hypervisor \
        lib/rapi \
+       lib/confd \
        man \
        qa \
        scripts \
@@ -38,14 +40,15 @@ DIRS = \
        tools
 
 MAINTAINERCLEANFILES = \
-       $(dochtml) \
-       $(patsubst %.dot,%.png,$(docdot)) \
+       $(docpng) \
        $(maninput)
 
+maintainer-clean-local:
+       -rm -rf doc/api doc/build doc/html
+
 CLEANFILES = \
        autotools/replace_vars.sed \
        devel/upload \
-       doc/rapi-resources.gen \
        doc/examples/bash_completion \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
@@ -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,6 +89,7 @@ pkgpython_PYTHON = \
        lib/serializer.py \
        lib/ssconf.py \
        lib/ssh.py \
+       lib/storage.py \
        lib/utils.py \
        lib/workerpool.py
 
@@ -108,28 +113,46 @@ 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 \
+       doc/index.rst \
        doc/install.rst \
+       doc/rapi.rst \
        doc/security.rst
 
-dochtml = $(patsubst %.rst,%.html,$(docrst))
+doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+       @test -n "$(SPHINX)" || \
+           { echo 'sphinx-build' not found during configure; exit 1; }
+       mkdir -p doc/build/doctrees
+       PYTHONPATH=.:$(top_builddir) sphinx-build -q -b html \
+           -d doc/build/doctrees \
+           -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+           -D release="$(PACKAGE_VERSION)" \
+           $(top_srcdir)/doc doc/html
+       touch "$@"
 
 docdot = \
        doc/arch-2.0.dot
 
-doc_DATA = $(dochtml)
+docpng = $(patsubst %.dot,%.png,$(docdot))
 
-noinst_DATA = $(manhtml)
+noinst_DATA = $(manhtml) doc/html
 
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
        daemons/ganeti-masterd \
+       daemons/ganeti-confd \
        daemons/ganeti-rapi \
        scripts/gnt-backup \
        scripts/gnt-cluster \
@@ -149,15 +172,18 @@ EXTRA_DIST = \
        $(MAINTAINERCLEANFILES) \
        NEWS \
        DEVNOTES \
+       pylintrc \
        autotools/docbook-wrapper \
        devel/upload.in \
-       $(docrst) \
        $(docdot) \
-       doc/build-rapi-resources-doc \
+       $(docrst) \
+       doc/conf.py \
+       doc/html \
        doc/examples/bash_completion.in \
        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 \
@@ -200,9 +226,11 @@ maninput = $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) $(patsubst
 
 TEST_FILES = \
        test/data/bdev-both.txt \
+       test/data/bdev-8.3-both.txt \
        test/data/bdev-disk.txt \
        test/data/bdev-net.txt \
-       test/data/proc_drbd8.txt
+       test/data/proc_drbd8.txt \
+       test/data/proc_drbd83.txt
 
 dist_TESTS = \
        test/ganeti.bdev_unittest.py \
@@ -213,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 \
@@ -223,9 +252,7 @@ nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
-
-RAPI_RESOURCES = $(wildcard lib/rapi/*.py)
+TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
 
 all-local: stamp-directories lib/_autoconf.py devel/upload \
        doc/examples/bash_completion \
@@ -239,22 +266,10 @@ doc/examples/%: doc/examples/%.in stamp-directories \
                $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/%.html: doc/%.rst
-       @test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; }
-       $(RST2HTML) $< $@
-
 doc/%.png: doc/%.dot
        @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
        $(DOT) -Tpng -o $@ $<
 
-doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
-
-doc/rapi.html: doc/rapi-resources.gen
-
-doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
-       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
-         rm -f $@
-
 man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
        @test -n "$(DOCBOOK2MAN)" || { echo 'docbook2html' not found during configure; exit 1; }
        TMPDIR=`mktemp -d` && { \
@@ -282,7 +297,7 @@ man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
 
 man/footer.sgml $(TESTS): srclinks
 
-$(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
+$(TESTS): ganeti lib/_autoconf.py
 
 lib/_autoconf.py: Makefile stamp-directories
        set -e; \
@@ -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; \
@@ -375,4 +392,11 @@ apidoc:
                rm -rf $$TMPDIR ; \
        }
 
+.PHONY: TAGS
+TAGS:
+       rm -f TAGS
+       find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
+         -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+         etags -
+
 # vim: set noet :