Fix bug introduced by f5677ab
[ganeti-local] / Makefile.am
index 7d61f71..029d751 100644 (file)
@@ -26,6 +26,7 @@ rapidir = $(pkgpythondir)/rapi
 serverdir = $(pkgpythondir)/server
 watcherdir = $(pkgpythondir)/watcher
 impexpddir = $(pkgpythondir)/impexpd
+utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
@@ -50,6 +51,7 @@ DIRS = \
        lib/masterd \
        lib/rapi \
        lib/server \
+       lib/utils \
        lib/watcher \
        man \
        qa \
@@ -78,6 +80,7 @@ MAINTAINERCLEANFILES = \
        $(maninput) \
        doc/install-quick.rst \
        doc/news.rst \
+       doc/upgrade.rst \
        vcs-version
 
 maintainer-clean-local:
@@ -94,6 +97,7 @@ CLEANFILES = \
        devel/upload \
        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 \
@@ -147,7 +151,6 @@ pkgpython_PYTHON = \
        lib/ssconf.py \
        lib/ssh.py \
        lib/storage.py \
-       lib/utils.py \
        lib/uidpool.py \
        lib/workerpool.py
 
@@ -156,6 +159,7 @@ client_PYTHON = \
        lib/client/gnt_backup.py \
        lib/client/gnt_cluster.py \
        lib/client/gnt_debug.py \
+       lib/client/gnt_group.py \
        lib/client/gnt_instance.py \
        lib/client/gnt_job.py \
        lib/client/gnt_node.py \
@@ -207,12 +211,28 @@ server_PYTHON = \
        lib/server/noded.py \
        lib/server/rapi.py
 
+utils_PYTHON = \
+       lib/utils/__init__.py \
+       lib/utils/algo.py \
+       lib/utils/filelock.py \
+       lib/utils/hash.py \
+       lib/utils/io.py \
+       lib/utils/log.py \
+       lib/utils/mlock.py \
+       lib/utils/nodesetup.py \
+       lib/utils/process.py \
+       lib/utils/retry.py \
+       lib/utils/text.py \
+       lib/utils/wrapper.py \
+       lib/utils/x509.py
+
 docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
        doc/design-2.2.rst \
        doc/design-2.3.rst \
+       doc/design-2.4.rst \
        doc/design-oob.rst \
        doc/design-query2.rst \
        doc/cluster-merge.rst \
@@ -228,6 +248,7 @@ docrst = \
        doc/news.rst \
        doc/rapi.rst \
        doc/security.rst \
+       doc/upgrade.rst \
        doc/walkthrough.rst
 
 $(RUN_IN_TEMPDIR): | $(all_dirfiles)
@@ -247,15 +268,11 @@ doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
 
 doc/html: doc/html/index.html
 
+doc/install-quick.rst: INSTALL
 doc/news.rst: NEWS
-       set -e; \
-       { echo '.. This file is automatically updated at build time from $<.'; \
-         echo '.. Do not edit.'; \
-         echo; \
-         cat $<; \
-       } > $@
+doc/upgrade.rst: UPGRADE
 
-doc/install-quick.rst: INSTALL
+doc/install-quick.rst doc/news.rst doc/upgrade.rst:
        set -e; \
        { echo '.. This file is automatically updated at build time from $<.'; \
          echo '.. Do not edit.'; \
@@ -278,6 +295,7 @@ noinst_DATA = \
        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)
@@ -286,6 +304,7 @@ gnt_scripts = \
        scripts/gnt-backup \
        scripts/gnt-cluster \
        scripts/gnt-debug \
+       scripts/gnt-group \
        scripts/gnt-instance \
        scripts/gnt-job \
        scripts/gnt-node \
@@ -300,12 +319,28 @@ PYTHON_BOOTSTRAP = \
        scripts/gnt-backup \
        scripts/gnt-cluster \
        scripts/gnt-debug \
+       scripts/gnt-group \
        scripts/gnt-instance \
        scripts/gnt-job \
        scripts/gnt-node \
        scripts/gnt-os
 
-dist_sbin_SCRIPTS =
+qa_scripts = \
+       qa/ganeti-qa.py \
+       qa/qa_cluster.py \
+       qa/qa_config.py \
+       qa/qa_daemon.py \
+       qa/qa_env.py \
+       qa/qa_error.py \
+       qa/qa_instance.py \
+       qa/qa_node.py \
+       qa/qa_os.py \
+       qa/qa_rapi.py \
+       qa/qa_tags.py \
+       qa/qa_utils.py
+
+dist_sbin_SCRIPTS = \
+       tools/ganeti-listrunner
 
 nodist_sbin_SCRIPTS = \
        $(PYTHON_BOOTSTRAP) \
@@ -333,6 +368,7 @@ pkglib_SCRIPTS = \
 
 EXTRA_DIST = \
        NEWS \
+       UPGRADE \
        pylintrc \
        autotools/build-bash-completion \
        autotools/check-python-code \
@@ -353,6 +389,7 @@ EXTRA_DIST = \
        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 \
        doc/examples/dumb-allocator \
@@ -370,24 +407,14 @@ EXTRA_DIST = \
        man/footer.rst \
        $(manrst) \
        $(maninput) \
-       qa/ganeti-qa.py \
        qa/qa-sample.json \
-       qa/qa_cluster.py \
-       qa/qa_config.py \
-       qa/qa_daemon.py \
-       qa/qa_env.py \
-       qa/qa_error.py \
-       qa/qa_instance.py \
-       qa/qa_node.py \
-       qa/qa_os.py \
-       qa/qa_rapi.py \
-       qa/qa_tags.py \
-       qa/qa_utils.py
+       $(qa_scripts)
 
 man_MANS = \
        man/ganeti.7 \
        man/ganeti-cleaner.8 \
        man/ganeti-confd.8 \
+       man/ganeti-listrunner.8 \
        man/ganeti-masterd.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
@@ -396,6 +423,7 @@ man_MANS = \
        man/gnt-backup.8 \
        man/gnt-cluster.8 \
        man/gnt-debug.8 \
+       man/gnt-group.8 \
        man/gnt-instance.8 \
        man/gnt-job.8 \
        man/gnt-node.8 \
@@ -426,6 +454,7 @@ python_tests = \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \
        test/ganeti.cli_unittest.py \
+       test/ganeti.client.gnt_instance_unittest.py \
        test/ganeti.daemon_unittest.py \
        test/ganeti.cmdlib_unittest.py \
        test/ganeti.compat_unittest.py \
@@ -434,9 +463,14 @@ python_tests = \
        test/ganeti.constants_unittest.py \
        test/ganeti.errors_unittest.py \
        test/ganeti.hooks_unittest.py \
+       test/ganeti.ht_unittest.py \
        test/ganeti.http_unittest.py \
        test/ganeti.hypervisor_unittest.py \
+       test/ganeti.hypervisor.hv_chroot_unittest.py \
+       test/ganeti.hypervisor.hv_fake_unittest.py \
        test/ganeti.hypervisor.hv_kvm_unittest.py \
+       test/ganeti.hypervisor.hv_lxc_unittest.py \
+       test/ganeti.hypervisor.hv_xen_unittest.py \
        test/ganeti.impexpd_unittest.py \
        test/ganeti.jqueue_unittest.py \
        test/ganeti.locking_unittest.py \
@@ -448,6 +482,7 @@ python_tests = \
        test/ganeti.opcodes_unittest.py \
        test/ganeti.qlang_unittest.py \
        test/ganeti.query_unittest.py \
+       test/ganeti.rapi.baserlib_unittest.py \
        test/ganeti.rapi.client_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.rapi.rlib2_unittest.py \
@@ -456,8 +491,18 @@ python_tests = \
        test/ganeti.serializer_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.uidpool_unittest.py \
+       test/ganeti.utils.algo_unittest.py \
+       test/ganeti.utils.filelock_unittest.py \
+       test/ganeti.utils.hash_unittest.py \
+       test/ganeti.utils.io_unittest.py \
+       test/ganeti.utils.mlock_unittest.py \
+       test/ganeti.utils.nodesetup_unittest.py \
+       test/ganeti.utils.process_unittest.py \
+       test/ganeti.utils.retry_unittest.py \
+       test/ganeti.utils.text_unittest.py \
+       test/ganeti.utils.wrapper_unittest.py \
+       test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
-       test/ganeti.utils_mlockall_unittest.py \
        test/ganeti.workerpool_unittest.py \
        test/cfgupgrade_unittest.py \
        test/docs_unittest.py \
@@ -496,8 +541,10 @@ all_python_code = \
        $(confd_PYTHON) \
        $(masterd_PYTHON) \
        $(impexpd_PYTHON) \
+       $(utils_PYTHON) \
        $(watcher_PYTHON) \
-       $(noinst_PYTHON)
+       $(noinst_PYTHON) \
+       $(qa_scripts)
 
 srclink_files = \
        man/footer.rst \
@@ -650,6 +697,7 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
          echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
          echo "NODED_USER = '$(NODED_USER)'"; \
          echo "VCS_VERSION = '$$VCSVER'"; \
+         echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile
@@ -755,6 +803,9 @@ check-local: check-dirs
 lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
+       cd $(top_srcdir)/qa && \
+         PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
+         --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...