Add a ‘drained’ attribute to node objects

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e427760..2872e7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,11 +97,11 @@ rapi_PYTHON = \
        lib/rapi/__init__.py \
        lib/rapi/baserlib.py \
        lib/rapi/connector.py \
-       lib/rapi/rlib1.py \
        lib/rapi/rlib2.py
 
 http_PYTHON = \
        lib/http/__init__.py \
+       lib/http/auth.py \
        lib/http/client.py \
        lib/http/server.py
 
@@ -269,6 +269,15 @@ lib/_autoconf.py: Makefile stamp-directories
        set -e; \
        { echo '# This file is automatically generated, do not edit!'; \
          echo '#'; \
+         echo ''; \
+         echo '"""Build-time configuration for Ganeti.'; \
+         echo '';\
+         echo 'This file is autogenerated by the build process.'; \
+         echo 'For any changes you need to re-run ./configure (and'; \
+         echo 'not edit by hand).'; \
+         echo ''; \
+         echo '"""'; \
+         echo ''; \
          echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
          echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \
          echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \
@@ -285,6 +294,8 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
          echo "KVM_PATH = '$(KVM_PATH)'"; \
+         echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
+         echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -344,7 +355,7 @@ apidoc:
                        CDIR=`pwd` && \
                        cd $$TMPDIR && \
                        mv lib ganeti && \
-                       epydoc --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
+                       epydoc -v --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
                ) ; \
                rm -rf $$TMPDIR ; \
        }