X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/278ddaa9616f10020add6c5045439c45399c9341..96bc20038027b17e5c20fd651fc57dbcce798c0d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cc4c523..759f717 100644
--- 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
 
@@ -16,11 +21,15 @@ ACLOCAL_AMFLAGS = -I autotools
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
+CHECK_HEADER = $(top_srcdir)/autotools/check-header
 CHECK_MAN = $(top_srcdir)/autotools/check-man
 CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
+CHECK_IMPORTS = $(top_srcdir)/autotools/check-imports
 DOCPP = $(top_srcdir)/autotools/docpp
 REPLACE_VARS_SED = autotools/replace_vars.sed
+CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
+BUILD_RPC = $(top_srcdir)/autotools/build-rpc
 
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
@@ -36,6 +45,7 @@ impexpddir = $(pkgpythondir)/impexpd
 utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 iallocatorsdir = $(pkglibdir)/iallocators
+pytoolsdir = $(pkgpythondir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
 # Delete output file if an error occurred while building it
@@ -44,7 +54,8 @@ docdir = $(datadir)/doc/$(PACKAGE)
 HTOOLS_DIRS = \
 	htools \
 	htools/Ganeti \
-	htools/Ganeti/HTools
+	htools/Ganeti/HTools \
+	htools/Ganeti/HTools/Program
 
 DIRS = \
 	autotools \
@@ -65,12 +76,15 @@ DIRS = \
 	lib/masterd \
 	lib/rapi \
 	lib/server \
+	lib/tools \
 	lib/utils \
 	lib/watcher \
 	man \
 	qa \
 	test \
 	test/data \
+	test/data/ovfdata \
+	test/data/ovfdata/other \
 	tools
 
 BUILDTIME_DIR_AUTOCREATE = \
@@ -79,6 +93,7 @@ BUILDTIME_DIR_AUTOCREATE = \
 	$(APIDOC_PY_DIR) \
 	$(APIDOC_HS_DIR) \
 	$(APIDOC_HS_DIR)/Ganeti $(APIDOC_HS_DIR)/Ganeti/HTools \
+	$(APIDOC_HS_DIR)/Ganeti/HTools/Program \
 	$(COVERAGE_DIR) \
 	$(COVERAGE_PY_DIR) \
 	$(COVERAGE_HS_DIR) \
@@ -123,15 +138,11 @@ CLEANFILES = \
 	epydoc.conf \
 	autotools/replace_vars.sed \
 	daemons/daemon-util \
-	daemons/ensure-dirs \
 	daemons/ganeti-cleaner \
 	devel/upload \
+	$(BUILT_EXAMPLES) \
 	doc/examples/bash_completion \
-	doc/examples/ganeti.initd \
-	doc/examples/ganeti-kvm-poweroff.initd \
-	doc/examples/ganeti.cron \
-	doc/examples/gnt-config-backup \
-	doc/examples/hooks/ipsec \
+	lib/_generated_rpc.py \
 	$(man_MANS) \
 	$(manhtml) \
 	tools/kvm-ifup \
@@ -144,14 +155,37 @@ CLEANFILES = \
 # BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
 # it'll cause the target to rebuild every time.
 BUILT_SOURCES = \
+  $(built_base_sources) \
+	$(BUILT_PYTHON_SOURCES) \
+	$(PYTHON_BOOTSTRAP)
+
+built_base_sources = \
 	ganeti \
 	stamp-srclinks \
+	$(all_dirfiles)
+
+built_python_base_sources = \
 	lib/_autoconf.py \
-	$(all_dirfiles) \
-	$(PYTHON_BOOTSTRAP)
+	lib/_vcsversion.py
+
+BUILT_PYTHON_SOURCES = \
+	$(built_python_base_sources) \
+	lib/_generated_rpc.py
+
+# Generating the RPC wrappers depends on many things, so make sure it's built at
+# the end of the built sources
+lib/_generated_rpc.py: | $(built_base_sources) $(built_python_base_sources)
+
+# these are all built from the underlying %.in sources
+BUILT_EXAMPLES = \
+	doc/examples/ganeti-kvm-poweroff.initd \
+	doc/examples/ganeti.cron \
+	doc/examples/ganeti.initd \
+	doc/examples/gnt-config-backup \
+	doc/examples/hooks/ipsec
 
 nodist_pkgpython_PYTHON = \
-	lib/_autoconf.py
+	$(BUILT_PYTHON_SOURCES)
 
 noinst_PYTHON = \
 	lib/build/__init__.py \
@@ -179,9 +213,11 @@ pkgpython_PYTHON = \
 	lib/netutils.py \
 	lib/objects.py \
 	lib/opcodes.py \
+	lib/ovf.py \
 	lib/qlang.py \
 	lib/query.py \
 	lib/rpc.py \
+	lib/rpc_defs.py \
 	lib/runtime.py \
 	lib/serializer.py \
 	lib/ssconf.py \
@@ -238,7 +274,9 @@ impexpd_PYTHON = \
 	lib/impexpd/__init__.py
 
 watcher_PYTHON = \
-	lib/watcher/__init__.py
+	lib/watcher/__init__.py \
+	lib/watcher/nodemaint.py \
+	lib/watcher/state.py
 
 server_PYTHON = \
 	lib/server/__init__.py \
@@ -247,6 +285,10 @@ server_PYTHON = \
 	lib/server/noded.py \
 	lib/server/rapi.py
 
+pytools_PYTHON = \
+	lib/tools/__init__.py \
+	lib/tools/ensure_dirs.py
+
 utils_PYTHON = \
 	lib/utils/__init__.py \
 	lib/utils/algo.py \
@@ -270,13 +312,24 @@ docrst = \
 	doc/design-2.3.rst \
 	doc/design-htools-2.3.rst \
 	doc/design-2.4.rst \
+	doc/design-2.5.rst \
 	doc/design-draft.rst \
 	doc/design-oob.rst \
+	doc/design-cpu-pinning.rst \
 	doc/design-query2.rst \
 	doc/design-x509-ca.rst \
 	doc/design-http-server.rst \
+	doc/design-impexp2.rst \
+	doc/design-lu-generated-jobs.rst \
+	doc/design-multi-reloc.rst \
+	doc/design-network.rst \
+	doc/design-chained-jobs.rst \
+	doc/design-ovf-support.rst \
+	doc/design-resource-model.rst \
 	doc/cluster-merge.rst \
 	doc/design-shared-storage.rst \
+	doc/design-node-state-cache.rst \
+	doc/design-virtual-clusters.rst \
 	doc/devnotes.rst \
 	doc/glossary.rst \
 	doc/hooks.rst \
@@ -292,11 +345,8 @@ docrst = \
 	doc/upgrade.rst \
 	doc/walkthrough.rst
 
-HS_PROGS = \
-	htools/hbal \
-	htools/hscan \
-	htools/hail \
-	htools/hspace
+HS_PROGS = htools/htools
+HS_BIN_ROLES = hbal hscan hspace
 
 HS_ALL_PROGS = $(HS_PROGS) htools/test
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
@@ -305,31 +355,45 @@ HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
 # extra flags that can be overriden on the command line
 HEXTRA =
 # exclude options for coverage reports
-HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC
+HPCEXCL = --exclude Main \
+	--exclude Ganeti.Constants \
+	--exclude Ganeti.THH \
+	--exclude Ganeti.HTools.QC \
+	--exclude Ganeti.HTools.QCHelper \
+	--exclude Ganeti.HTools.Version
 
 HS_LIB_SRCS = \
 	htools/Ganeti/HTools/CLI.hs \
 	htools/Ganeti/HTools/Cluster.hs \
+	htools/Ganeti/HTools/Compat.hs \
 	htools/Ganeti/HTools/Container.hs \
 	htools/Ganeti/HTools/ExtLoader.hs \
 	htools/Ganeti/HTools/Group.hs \
 	htools/Ganeti/HTools/IAlloc.hs \
 	htools/Ganeti/HTools/Instance.hs \
+	htools/Ganeti/HTools/JSON.hs \
 	htools/Ganeti/HTools/Loader.hs \
 	htools/Ganeti/HTools/Luxi.hs \
 	htools/Ganeti/HTools/Node.hs \
 	htools/Ganeti/HTools/PeerMap.hs \
 	htools/Ganeti/HTools/QC.hs \
+	htools/Ganeti/HTools/QCHelper.hs \
 	htools/Ganeti/HTools/Rapi.hs \
 	htools/Ganeti/HTools/Simu.hs \
 	htools/Ganeti/HTools/Text.hs \
 	htools/Ganeti/HTools/Types.hs \
 	htools/Ganeti/HTools/Utils.hs \
+	htools/Ganeti/HTools/Program/Hail.hs \
+	htools/Ganeti/HTools/Program/Hbal.hs \
+	htools/Ganeti/HTools/Program/Hscan.hs \
+	htools/Ganeti/HTools/Program/Hspace.hs \
+	htools/Ganeti/BasicTypes.hs \
 	htools/Ganeti/Jobs.hs \
 	htools/Ganeti/Luxi.hs \
-	htools/Ganeti/OpCodes.hs
+	htools/Ganeti/OpCodes.hs \
+	htools/Ganeti/THH.hs
 
-HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs
+HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 $(RUN_IN_TEMPDIR): | $(all_dirfiles)
@@ -341,7 +405,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
+	| $(BUILT_PYTHON_SOURCES)
 	@test -n "$(SPHINX)" || \
 	    { echo 'sphinx-build' not found during configure; exit 1; }
 	@mkdir_p@ $(dir $@)
@@ -379,12 +443,8 @@ docpng = $(patsubst %.dot,%.png,$(docdot))
 noinst_DATA = \
 	devel/upload \
 	doc/html \
+	$(BUILT_EXAMPLES) \
 	doc/examples/bash_completion \
-	doc/examples/ganeti.cron \
-	doc/examples/ganeti.initd \
-	doc/examples/ganeti-kvm-poweroff.initd \
-	doc/examples/gnt-config-backup \
-	doc/examples/hooks/ipsec \
 	$(manhtml)
 
 gnt_scripts = \
@@ -397,20 +457,17 @@ gnt_scripts = \
 	scripts/gnt-node \
 	scripts/gnt-os
 
-PYTHON_BOOTSTRAP = \
+PYTHON_BOOTSTRAP_SBIN = \
 	daemons/ganeti-confd \
 	daemons/ganeti-masterd \
 	daemons/ganeti-noded \
 	daemons/ganeti-watcher \
 	daemons/ganeti-rapi \
-	scripts/gnt-backup \
-	scripts/gnt-cluster \
-	scripts/gnt-debug \
-	scripts/gnt-group \
-	scripts/gnt-instance \
-	scripts/gnt-job \
-	scripts/gnt-node \
-	scripts/gnt-os
+	$(gnt_scripts)
+
+PYTHON_BOOTSTRAP = \
+	$(PYTHON_BOOTSTRAP_SBIN) \
+	tools/ensure-dirs
 
 qa_scripts = \
 	qa/ganeti-qa.py \
@@ -419,6 +476,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 \
@@ -427,18 +485,34 @@ qa_scripts = \
 	qa/qa_utils.py
 
 bin_SCRIPTS =
-iallocators_SCRIPTS =
 if WANT_HTOOLS
 bin_SCRIPTS += $(filter-out htools/hail,$(HS_PROGS))
-iallocators_SCRIPTS += $(filter htools/hail,$(HS_PROGS))
+install-exec-hook:
+	@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
+# FIXME: this is a hardcoded logic, instead of auto-resolving
+	$(LN_S) -f ../../../bin/htools \
+		   $(DESTDIR)$(iallocatorsdir)/hail
+	for role in $(HS_BIN_ROLES); do \
+		$(LN_S) -f htools \
+			   $(DESTDIR)$(bindir)/$$role ; \
+	done
 endif
 
 $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
-	BINARY=$(@:htools/%=%); \
-	$(GHC) --make \
-	  $(HFLAGS) $(HEXTRA) $(HTOOLS_NOCURL) \
+	@if [ -z "$(HTOOLS)" ]; then \
+	  echo "Error: htools compilation disabled at configure time" 1>&2 ;\
+	  exit 1; \
+	fi
+	@BINARY=$(@:htools/%=%); \
+	if [ "$BINARY" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
+	  echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
+	  exit 1; \
+	fi
+	BINARY=$(@:htools/%=%); $(GHC) --make \
+	  $(HFLAGS) \
+	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
 	  -osuf $$BINARY.o -hisuf $$BINARY.hi \
-	  $@
+	  $(HEXTRA) $@
 
 # for the htools/test binary, we need to enable profiling/coverage
 htools/test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
@@ -449,47 +523,63 @@ dist_sbin_SCRIPTS = \
 	tools/ganeti-listrunner
 
 nodist_sbin_SCRIPTS = \
-	$(PYTHON_BOOTSTRAP) \
+	$(PYTHON_BOOTSTRAP_SBIN) \
 	daemons/ganeti-cleaner
 
-dist_tools_SCRIPTS = \
+python_scripts = \
 	tools/burnin \
 	tools/cfgshell \
 	tools/cfgupgrade \
 	tools/cfgupgrade12 \
 	tools/cluster-merge \
+	tools/confd-client \
 	tools/lvmstrap \
 	tools/move-instance \
+	tools/ovfconverter \
 	tools/setup-ssh \
 	tools/sanitize-config
 
+dist_tools_SCRIPTS = \
+	$(python_scripts) \
+	tools/kvm-console-wrapper \
+	tools/xm-console-wrapper \
+	tools/master-ip-setup
+
 pkglib_python_scripts = \
 	daemons/import-export \
 	tools/check-cert-expired
 
+nodist_pkglib_python_scripts = \
+	tools/ensure-dirs
+
 pkglib_SCRIPTS = \
 	daemons/daemon-util \
-	daemons/ensure-dirs \
 	tools/kvm-ifup \
 	$(pkglib_python_scripts)
 
+nodist_pkglib_SCRIPTS = \
+	$(nodist_pkglib_python_scripts)
+
 EXTRA_DIST = \
 	NEWS \
 	UPGRADE \
 	epydoc.conf.in \
 	pylintrc \
 	autotools/build-bash-completion \
+	autotools/build-rpc \
+	autotools/check-header \
 	autotools/check-python-code \
+	autotools/check-imports \
 	autotools/check-man \
 	autotools/check-news \
 	autotools/check-tar \
 	autotools/check-version \
+	autotools/convert-constants \
 	autotools/docpp \
 	autotools/gen-coverage \
 	autotools/testrunner \
 	$(RUN_IN_TEMPDIR) \
 	daemons/daemon-util.in \
-	daemons/ensure-dirs.in \
 	daemons/ganeti-cleaner.in \
 	$(pkglib_python_scripts) \
 	devel/upload.in \
@@ -499,17 +589,14 @@ EXTRA_DIST = \
 	$(docrst) \
 	doc/conf.py \
 	doc/html \
-	doc/examples/ganeti.initd.in \
-	doc/examples/ganeti-kvm-poweroff.initd.in \
-	doc/examples/ganeti.cron.in \
-	doc/examples/gnt-config-backup.in \
+	$(BUILT_EXAMPLES:%=%.in) \
 	doc/examples/ganeti.default \
 	doc/examples/ganeti.default-debug \
 	doc/examples/hooks/ethers \
-	doc/examples/hooks/ipsec.in \
 	doc/examples/gnt-debug/README \
 	doc/examples/gnt-debug/delay0.json \
 	doc/examples/gnt-debug/delay50.json \
+	test/lockperf.py \
 	test/testutils.py \
 	test/mocks.py \
 	$(dist_TESTS) \
@@ -520,7 +607,8 @@ EXTRA_DIST = \
 	qa/qa-sample.json \
 	$(qa_scripts) \
 	$(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
-	$(HS_PROG_SRCS)
+	$(HS_PROG_SRCS) \
+	htools/lint-hints.hs
 
 man_MANS = \
 	man/ganeti.7 \
@@ -543,7 +631,8 @@ man_MANS = \
 	man/hail.1 \
 	man/hbal.1 \
 	man/hscan.1 \
-	man/hspace.1
+	man/hspace.1 \
+	man/htools.1
 
 manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
 manhtml = $(patsubst %.rst,%.html,$(manrst))
@@ -560,10 +649,48 @@ 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/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/kvm_1.0_help.txt \
+	test/data/kvm_0.15.90_help.txt \
+	test/data/kvm_0.12.5_help.txt \
+	test/data/kvm_0.9.1_help.txt \
 	test/data/sys_drbd_usermode_helper.txt \
+	test/data/ovfdata/compr_disk.vmdk.gz \
+	test/data/ovfdata/config.ini \
+	test/data/ovfdata/corrupted_resources.ovf \
+	test/data/ovfdata/empty.ini \
+	test/data/ovfdata/empty.ovf \
+	test/data/ovfdata/ganeti.mf \
+	test/data/ovfdata/ganeti.ovf \
+	test/data/ovfdata/gzip_disk.ovf \
+	test/data/ovfdata/new_disk.vmdk \
+	test/data/ovfdata/no_disk.ini \
+	test/data/ovfdata/no_disk_in_ref.ovf \
+	test/data/ovfdata/no_os.ini \
+	test/data/ovfdata/no_ovf.ova \
+	test/data/ovfdata/ova.ova \
+	test/data/ovfdata/second_disk.vmdk \
+	test/data/ovfdata/rawdisk.raw \
+	test/data/ovfdata/unsafe_path.ini \
+	test/data/ovfdata/virtualbox.ovf \
+	test/data/ovfdata/wrong_extension.ovd \
+	test/data/ovfdata/wrong_config.ini \
+	test/data/ovfdata/wrong_manifest.mf \
+	test/data/ovfdata/wrong_manifest.ovf \
+	test/data/ovfdata/wrong_ova.ova \
+	test/data/ovfdata/wrong_xml.ovf \
+	test/data/ovfdata/other/rawdisk.raw \
 	test/import-export_unittest-helper
 
 python_tests = \
@@ -598,6 +725,7 @@ python_tests = \
 	test/ganeti.netutils_unittest.py \
 	test/ganeti.objects_unittest.py \
 	test/ganeti.opcodes_unittest.py \
+	test/ganeti.ovf_unittest.py \
 	test/ganeti.qlang_unittest.py \
 	test/ganeti.query_unittest.py \
 	test/ganeti.rapi.baserlib_unittest.py \
@@ -608,6 +736,7 @@ python_tests = \
 	test/ganeti.runtime_unittest.py \
 	test/ganeti.serializer_unittest.py \
 	test/ganeti.ssh_unittest.py \
+	test/ganeti.tools.ensure_dirs_unittest.py \
 	test/ganeti.uidpool_unittest.py \
 	test/ganeti.utils.algo_unittest.py \
 	test/ganeti.utils.filelock_unittest.py \
@@ -625,7 +754,11 @@ python_tests = \
 	test/ganeti.workerpool_unittest.py \
 	test/cfgupgrade_unittest.py \
 	test/docs_unittest.py \
+	test/pycurl_reset_unittest.py \
 	test/tempfile_fork_unittest.py
+if HAS_FAKEROOT
+python_tests += test/ganeti.utils.io_unittest-runasroot.py
+endif
 
 haskell_tests = htools/test
 
@@ -637,7 +770,7 @@ dist_TESTS = \
 	$(python_tests)
 
 nodist_TESTS =
-if WANT_HTOOLS
+if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
 endif
 
@@ -645,7 +778,8 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \
-	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) $(RUN_IN_TEMPDIR)
+	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) \
+	FAKEROOT=$(FAKEROOT_PATH) $(RUN_IN_TEMPDIR)
 
 # Environment for tests run by automake
 TESTS_ENVIRONMENT = \
@@ -653,14 +787,16 @@ TESTS_ENVIRONMENT = \
 
 all_python_code = \
 	$(dist_sbin_SCRIPTS) \
-	$(dist_tools_SCRIPTS) \
+	$(python_scripts) \
 	$(pkglib_python_scripts) \
+	$(nodist_pkglib_python_scripts) \
 	$(python_tests) \
 	$(pkgpython_PYTHON) \
 	$(client_PYTHON) \
 	$(hypervisor_PYTHON) \
 	$(rapi_PYTHON) \
 	$(server_PYTHON) \
+	$(pytools_PYTHON) \
 	$(http_PYTHON) \
 	$(confd_PYTHON) \
 	$(masterd_PYTHON) \
@@ -681,6 +817,8 @@ srclink_files = \
 
 check_python_code = \
 	$(BUILD_BASH_COMPLETION) \
+	$(CHECK_IMPORTS) \
+	$(CHECK_HEADER) \
 	$(DOCPP) \
 	$(all_python_code)
 
@@ -688,12 +826,30 @@ lint_python_code = \
 	ganeti \
 	ganeti/http/server.py \
 	$(dist_sbin_SCRIPTS) \
-	$(dist_tools_SCRIPTS) \
+	$(python_scripts) \
 	$(pkglib_python_scripts) \
 	$(BUILD_BASH_COMPLETION) \
+	$(CHECK_IMPORTS) \
+	$(CHECK_HEADER) \
 	$(DOCPP) \
 	$(PYTHON_BOOTSTRAP)
 
+standalone_python_modules = \
+	lib/rapi/client.py \
+	tools/ganeti-listrunner
+
+pep8_python_code = \
+	ganeti \
+	ganeti/http/server.py \
+	$(dist_sbin_SCRIPTS) \
+	$(python_scripts) \
+	$(pkglib_python_scripts) \
+	$(BUILD_BASH_COMPLETION) \
+	$(CHECK_HEADER) \
+	$(DOCPP) \
+	$(PYTHON_BOOTSTRAP) \
+	qa
+
 test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
@@ -788,9 +944,14 @@ htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
 	sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
-lib/_autoconf.py: Makefile vcs-version | lib/.dir
+htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
+	lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS) \
+	| lib/_vcsversion.py
+	set -e; \
+	{ cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
+
+lib/_autoconf.py: Makefile | lib/.dir
 	set -e; \
-	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
 	{ echo '# This file is automatically generated, do not edit!'; \
 	  echo '#'; \
 	  echo ''; \
@@ -802,7 +963,7 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	  echo ''; \
 	  echo '"""'; \
 	  echo ''; \
-	  echo '# pylint: disable-msg=C0301,C0324'; \
+	  echo '# pylint: disable=C0301,C0324'; \
 	  echo '# because this is autogenerated, we do not want'; \
 	  echo '# style warnings' ; \
 	  echo ''; \
@@ -826,6 +987,7 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	  echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
 	  echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
 	  echo "KVM_PATH = '$(KVM_PATH)'"; \
+	  echo "IP_PATH = '$(IP_PATH)'"; \
 	  echo "SOCAT_PATH = '$(SOCAT)'"; \
 	  echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
 	  echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
@@ -833,7 +995,8 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	  echo "TOOLSDIR = '$(toolsdir)'"; \
 	  echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
 	  echo "PKGLIBDIR = '$(pkglibdir)'"; \
-	  echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \
+	  echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
+	  echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
 	  echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
 	  echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
 	  echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \
@@ -844,10 +1007,41 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	  echo "CONFD_USER = '$(CONFD_USER)'"; \
 	  echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
 	  echo "NODED_USER = '$(NODED_USER)'"; \
-	  echo "VCS_VERSION = '$$VCSVER'"; \
+	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
 	  echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
+	  echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
+	  if [ "$(HTOOLS)" ]; then \
+	    echo "HTOOLS = True"; \
+	  else \
+	    echo "HTOOLS = False"; \
+	  fi; \
+	  echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
+	} > $@
+
+lib/_vcsversion.py: Makefile vcs-version | lib/.dir
+	set -e; \
+	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
+	{ echo '# This file is automatically generated, do not edit!'; \
+	  echo '#'; \
+	  echo ''; \
+	  echo '"""Build-time VCS version number 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 '# pylint: disable=C0301,C0324'; \
+	  echo '# because this is autogenerated, we do not want'; \
+	  echo '# style warnings' ; \
+	  echo ''; \
+	  echo "VCS_VERSION = '$$VCSVER'"; \
 	} > $@
 
+lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
+	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
+
 $(REPLACE_VARS_SED): Makefile
 	set -e; \
 	{ echo 's#@PREFIX@#$(prefix)#g'; \
@@ -873,12 +1067,14 @@ $(REPLACE_VARS_SED): Makefile
 	  echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
 	  echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
 	  echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
+	  echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
 	} > $@
 
 # Using deferred evaluation
 daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
 daemons/ganeti-watcher: MODULE = ganeti.watcher
 scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
 
 $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	test -n "$(MODULE)" || { echo Missing module; exit 1; }
@@ -889,7 +1085,7 @@ $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	  echo; \
 	  echo '"""Bootstrap script for L{$(MODULE)}"""'; \
 	  echo; \
-	  echo '# pylint: disable-msg=C0103'; \
+	  echo '# pylint: disable=C0103'; \
 	  echo '# C0103: Invalid name'; \
 	  echo; \
 	  echo 'import sys'; \
@@ -898,7 +1094,9 @@ $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	  echo '# Temporarily alias commands until bash completion'; \
 	  echo '# generator is changed'; \
 	  echo 'if hasattr(main, "commands"):'; \
-		echo '  commands = main.commands # pylint: disable-msg=E1101'; \
+	  echo '  commands = main.commands # pylint: disable=E1101'; \
+	  echo 'if hasattr(main, "aliases"):'; \
+	  echo '  aliases = main.aliases # pylint: disable=E1101'; \
 	  echo; \
 	  echo 'if __name__ == "__main__":'; \
 	  echo '  sys.exit(main.Main())'; \
@@ -943,23 +1141,64 @@ check-dirs: $(BUILT_SOURCES)
 		if test -n "$$error"; then exit 1; else exit 0; fi; \
 	}
 
-check-local: check-dirs
+.PHONY: check-local
+check-local: check-dirs $(BUILT_SOURCES)
 	$(CHECK_PYTHON_CODE) $(check_python_code)
+	PYTHONPATH=. $(CHECK_HEADER) $(check_python_code)
 	$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
 	$(CHECK_NEWS) < $(top_srcdir)/NEWS
+	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
+	expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+	if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
+		echo "Incorrect version in README, expected $$expver"; \
+		exit 1; \
+	fi; \
+	for file in doc/iallocator.rst doc/hooks.rst; do \
+		if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
+			"Documents Ganeti version $$expver"; then \
+			echo "Incorrect version in $$file, expected $$expver"; \
+			exit 1; \
+		fi; \
+	done
+
+.PHONY: hs-check
+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) \
 	  --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 
 .PHONY: hlint
-hlint: $(HS_BUILT_SRCS)
+hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
 	if tty -s; then C="-c"; else C=""; fi; \
-	hlint --report=doc/hs-lint.html $$C htools
+	hlint --report=doc/hs-lint.html --cross $$C \
+	  --ignore "Use first" \
+	  --ignore "Use comparing" \
+	  --ignore "Use on" \
+	  --ignore "Use Control.Exception.catch" \
+	  --ignore "Reduce duplication" \
+	  --hint htools/lint-hints \
+	  $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
@@ -1039,12 +1278,19 @@ hs-apidoc: $(HS_BUILT_SRCS)
 	@test -n "$(HADDOCK)" || \
 	    { echo 'haddock' not found during configure; exit 1; }
 	rm -rf $(APIDOC_HS_DIR)/*
-	@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools
+	@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; \
-	RELSRCS="$(HS_LIB_SRCS:htools/%=%)"; \
+	if [ "$(HTOOLS_NOCURL)" ]; \
+	then OPTGHC="--optghc=$(HTOOLS_NOCURL)"; \
+	else OPTGHC=""; \
+	fi; \
+	if [ "$(HTOOLS_PARALLEL3)" ]; \
+	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
+	fi; \
+	RELSRCS="$(HS_LIB_SRCS:htools/%=%)  $(HS_BUILT_SRCS:htools/%=%)"; \
 	for file in $$RELSRCS; do \
 		hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
 		$(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
@@ -1053,6 +1299,7 @@ hs-apidoc: $(HS_BUILT_SRCS)
 		-t ganeti-htools -p haddock-prologue \
 		--source-module="%{MODULE/.//}.html" \
 		--source-entity="%{MODULE/.//}.html#%{NAME}" \
+		$$OPTGHC \
 		$(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:htools/%=%))
 
 .PHONY: TAGS
@@ -1082,9 +1329,10 @@ py-coverage: $(BUILT_SOURCES) $(python_tests)
 .PHONY: hs-coverage
 hs-coverage: $(haskell_tests)
 	cd htools && rm -f *.tix *.mix && ./test
-	mkdir -p $(COVERAGE_HS_DIR)
+	@mkdir_p@ $(COVERAGE_HS_DIR)
 	hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
 	hpc report htools/test $(HPCEXCL)
+	$(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)
@@ -1092,7 +1340,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/%=%)) \