Fix adding nodes after commit 64c7b3831dc

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cf86f21..8263901 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,11 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
+# Helper values for calling builtin functions
+empty :=
+space := $(empty) $(empty)
+comma := ,
+
 # Use bash in order to be able to use pipefail
 SHELL=/bin/bash
 
@@ -150,15 +155,17 @@ CLEANFILES = \
 BUILT_SOURCES = \
        ganeti \
        stamp-srclinks \
-       lib/_autoconf.py \
-       lib/_vcsversion.py \
        $(all_dirfiles) \
-       $(PYTHON_BOOTSTRAP)
+       $(PYTHON_BOOTSTRAP) \
+       $(BUILT_PYTHON_SOURCES)
 
-nodist_pkgpython_PYTHON = \
+BUILT_PYTHON_SOURCES = \
        lib/_autoconf.py \
        lib/_vcsversion.py
 
+nodist_pkgpython_PYTHON = \
+       $(BUILT_PYTHON_SOURCES)
+
 noinst_PYTHON = \
        lib/build/__init__.py \
        lib/build/sphinx_ext.py
@@ -294,6 +301,7 @@ docrst = \
        doc/design-multi-reloc.rst \
        doc/design-network.rst \
        doc/design-chained-jobs.rst \
+       doc/design-ovf-support.rst \
        doc/cluster-merge.rst \
        doc/design-shared-storage.rst \
        doc/devnotes.rst \
@@ -364,7 +372,7 @@ $(RUN_IN_TEMPDIR): | $(all_dirfiles)
 # it changes
 doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
        $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py lib/opcodes.py lib/ht.py \
-       | lib/_autoconf.py lib/_vcsversion.py
+       | $(BUILT_PYTHON_SOURCES)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
        @mkdir_p@ $(dir $@)
@@ -446,6 +454,7 @@ qa_scripts = \
        qa/qa_daemon.py \
        qa/qa_env.py \
        qa/qa_error.py \
+       qa/qa_group.py \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
@@ -613,16 +622,18 @@ TEST_FILES = \
        test/data/bdev-drbd-net-ip4.txt \
        test/data/bdev-drbd-net-ip6.txt \
        test/data/cert1.pem \
-  test/data/ip-addr-show-dummy0.txt \
-  test/data/ip-addr-show-lo-ipv4.txt \
-  test/data/ip-addr-show-lo-ipv6.txt \
-  test/data/ip-addr-show-lo-oneline-ipv4.txt \
-  test/data/ip-addr-show-lo-oneline-ipv6.txt \
-  test/data/ip-addr-show-lo-oneline.txt \
-  test/data/ip-addr-show-lo.txt \
+       test/data/ip-addr-show-dummy0.txt \
+       test/data/ip-addr-show-lo-ipv4.txt \
+       test/data/ip-addr-show-lo-ipv6.txt \
+       test/data/ip-addr-show-lo-oneline-ipv4.txt \
+       test/data/ip-addr-show-lo-oneline-ipv6.txt \
+       test/data/ip-addr-show-lo-oneline.txt \
+       test/data/ip-addr-show-lo.txt \
        test/data/proc_drbd8.txt \
        test/data/proc_drbd80-emptyline.txt \
        test/data/proc_drbd83.txt \
+       test/data/proc_drbd83_sync.txt \
+       test/data/proc_drbd83_sync_krnl2.6.39.txt \
        test/data/sys_drbd_usermode_helper.txt \
        test/import-export_unittest-helper
 
@@ -757,6 +768,17 @@ lint_python_code = \
        $(DOCPP) \
        $(PYTHON_BOOTSTRAP)
 
+pep8_python_code = \
+       ganeti \
+       ganeti/http/server.py \
+       $(dist_sbin_SCRIPTS) \
+       $(dist_tools_PYTHON) \
+       $(pkglib_python_scripts) \
+       $(BUILD_BASH_COMPLETION) \
+       $(DOCPP) \
+       $(PYTHON_BOOTSTRAP) \
+       qa
+
 test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
@@ -1062,9 +1084,23 @@ hs-check: htools/test
        @rm -f test.tix
        ./htools/test
 
+# E111: indentation is not a multiple of four
+# E261: at least two spaces before inline comment
+# E501: line too long (80 characters)
+PEP8_IGNORE = E111,E261,E501
+
+# For excluding pep8 expects filenames only, not whole paths
+PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
+
 .PHONY: lint
 lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
+       if test -z "$(PEP8)"; then \
+               echo '"pep8" not found during configure' >&2; \
+       else \
+               $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
+                       $(pep8_python_code); \
+       fi
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
        cd $(top_srcdir)/qa && \
          PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
@@ -1155,7 +1191,7 @@ hs-apidoc: $(HS_BUILT_SRCS)
        rm -rf $(APIDOC_HS_DIR)/*
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
        $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css
-       ln -s ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
+       $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
        set -e ; \
        cd htools; \
        if [ "$(HTOOLS_NOCURL)" ]; \
@@ -1207,7 +1243,7 @@ hs-coverage: $(haskell_tests)
        @mkdir_p@ $(COVERAGE_HS_DIR)
        hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
        hpc report htools/test $(HPCEXCL)
-       ln -sf hpc_index.html $(COVERAGE_HS_DIR)/index.html
+       $(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all
 # tools compiled with -fhpc)
@@ -1215,7 +1251,7 @@ hs-coverage: $(haskell_tests)
 live-test: all
        set -e ; \
        cd htools; \
-       rm -f .hpc; ln -s ../.hpc .hpc; \
+       rm -f .hpc; $(LN_S) ../.hpc .hpc; \
        rm -f *.tix *.mix; \
        ./live-test.sh; \
        hpc sum --union $(HPCEXCL) $(addsuffix .tix,$(HS_PROGS:htools/%=%)) \